From 90013af6f932d7553290f1eb42490ec7f4d94f46 Mon Sep 17 00:00:00 2001
From: Nikolay Sivov <nsivov@codeweavers.com>
Date: Fri, 11 Jun 2010 03:57:53 +0400
Subject: [PATCH] msvcrt: Fix __lconv_init() prototype.

---
 dlls/msvcr90/msvcr90.c | 1 +
 dlls/msvcrt/locale.c   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c
index 43a18343345..0d7d101b29e 100644
--- 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);
diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c
index a3479626e30..5a27de02d01 100644
--- 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;
 }
 
 /*********************************************************************