[PATCH 3/3] msvcrt: add some missing CDECL

[Marcus Meissner]

Hi,

Likely these are missing the CDECLs. Especially lfind
and lsearch do, the others too.

Not sure if its needed in except, i left out the i386
specific ones.

Ciao, Marcus
---
 dlls/msvcrt/except.c |    8 ++++----
 dlls/msvcrt/heap.c   |    2 +-
 dlls/msvcrt/math.c   |    2 +-
 dlls/msvcrt/misc.c   |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c
index 494b5af..d5a00d0 100644
--- a/dlls/msvcrt/except.c
+++ b/dlls/msvcrt/except.c
@@ -41,8 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh);
 typedef struct _SCOPETABLE
 {
   int previousTryLevel;
-  int (*lpfnFilter)(PEXCEPTION_POINTERS);
-  int (*lpfnHandler)(void);
+  int (CDECL *lpfnFilter)(PEXCEPTION_POINTERS);
+  int (CDECL *lpfnHandler)(void);
 } SCOPETABLE, *PSCOPETABLE;
 
 typedef struct _MSVCRT_EXCEPTION_FRAME
@@ -311,7 +311,7 @@ int CDECL _except_handler3(PEXCEPTION_RECORD rec,
 /*********************************************************************
  *		_except_handler4_common (MSVCRT.@)
  */
-int CDECL _except_handler4_common( ULONG *cookie, void (*check_cookie)(void),
+int CDECL _except_handler4_common( ULONG *cookie, void (CDECL *check_cookie)(void),
                                    EXCEPTION_RECORD *rec, MSVCRT_EXCEPTION_FRAME *frame,
                                    CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher )
 {
@@ -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)
-- 
1.6.4.2