Module: wine Branch: master Commit: f10af18f2816cf5cda788d85c41ba4862181db26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f10af18f2816cf5cda788d85c4...
Author: Marcus Meissner meissner@suse.de Date: Wed May 12 17:15:29 2010 +0200
msvcrt: Add some missing CDECL.
---
dlls/msvcrt/except.c | 2 +- dlls/msvcrt/heap.c | 2 +- dlls/msvcrt/math.c | 2 +- dlls/msvcrt/misc.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 494b5af..94a4367 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -576,7 +576,7 @@ static BOOL WINAPI msvcrt_console_handler(DWORD ctrlType) return ret; }
-typedef void (*float_handler)(int, int); +typedef void (CDECL *float_handler)(int, int);
/* The exception codes are actually NTSTATUS values */ static const struct diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index bd7cf35..ad6bb37 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); ~(alignment - 1)) - offset))
-typedef void (*MSVCRT_new_handler_func)(MSVCRT_size_t size); +typedef void (CDECL *MSVCRT_new_handler_func)(MSVCRT_size_t size);
static MSVCRT_new_handler_func MSVCRT_new_handler; static int MSVCRT_new_mode; diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 594555f..1895b39 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define signbit(x) 0 #endif
-typedef int (*MSVCRT_matherr_func)(struct MSVCRT__exception *); +typedef int (CDECL *MSVCRT_matherr_func)(struct MSVCRT__exception *);
static MSVCRT_matherr_func MSVCRT_default_matherr_func = NULL;
diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index c345589..c044d63 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -88,7 +88,7 @@ void CDECL MSVCRT__sleep(MSVCRT_ulong timeout) */ void* CDECL _lfind(const void* match, const void* start, unsigned int* array_size, unsigned int elem_size, - int (*cf)(const void*,const void*) ) + int (CDECL *cf)(const void*,const void*) ) { unsigned int size = *array_size; if (size) @@ -106,7 +106,7 @@ void* CDECL _lfind(const void* match, const void* start, */ void* CDECL _lsearch(const void* match, void* start, unsigned int* array_size, unsigned int elem_size, - int (*cf)(const void*,const void*) ) + int (CDECL *cf)(const void*,const void*) ) { unsigned int size = *array_size; if (size)