msvcrt: Fix __lconv_init() prototype.

90013af6 · Nikolay Sivov · Alexandre Julliard · 4801209c · 90013af6 · 90013af6
Commit 90013af6 authored Jun 11, 2010 by Nikolay Sivov Committed by Alexandre Julliard Jun 11, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

msvcr90.c dlls/msvcr90/msvcr90.c +1 -0

locale.c dlls/msvcrt/locale.c +2 -1

No files found.
--- a/dlls/msvcr90/msvcr90.c
+++ b/dlls/msvcr90/msvcr90.c
@@ -93,6 +93,7 @@ int CDECL _initterm_e(_INITTERM_E_FN *table, _INITTERM_E_FN *end)

    while (!res && table < end) {
        if (*table) {
+            TRACE("calling %p\n", **table);
            res = (**table)();
            if (res)
                TRACE("function %p failed: 0x%x\n", *table, res);

--- a/dlls/msvcrt/locale.c
+++ b/dlls/msvcrt/locale.c
@@ -541,10 +541,11 @@ struct MSVCRT_lconv * CDECL MSVCRT_localeconv(void)
 /*********************************************************************
 *		__lconv_init (MSVCRT.@)
 */
-void CDECL __lconv_init(void)
+int CDECL __lconv_init(void)
 {
    /* this is used to make chars unsigned */
    charmax = 255;
+    return 0;
 }

 /*********************************************************************