Module: wine Branch: master Commit: 90013af6f932d7553290f1eb42490ec7f4d94f46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90013af6f932d7553290f1eb42...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Fri Jun 11 03:57:53 2010 +0400
msvcrt: Fix __lconv_init() prototype.
---
dlls/msvcr90/msvcr90.c | 1 + dlls/msvcrt/locale.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 43a1834..0d7d101 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 a347962..5a27de0 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; }
/*********************************************************************