diff --git a/include/mscoree.idl b/include/mscoree.idl index d7e3227e6c7..8d3f4d35e52 100644 --- a/include/mscoree.idl +++ b/include/mscoree.idl @@ -27,7 +27,7 @@ cpp_quote("HRESULT WINAPI GetCORSystemDirectory(LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI GetCORVersion(LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,DWORD,LPWSTR,DWORD,DWORD*,LPWSTR,DWORD,DWORD*);") cpp_quote("HRESULT WINAPI LoadLibraryShim(LPCWSTR,LPCWSTR,LPVOID,HMODULE*);") -cpp_quote("#ifdef WINE_STRICT_PROTOTYPES") +cpp_quote("#ifndef WINE_NO_STRICT_PROTOTYPES") cpp_quote("typedef HRESULT (__stdcall *FLockClrVersionCallback)(void);") cpp_quote("#else") cpp_quote("typedef HRESULT (__stdcall *FLockClrVersionCallback)();") diff --git a/include/rpcndr.h b/include/rpcndr.h index 4e2a4e1ddb6..75f93b48771 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -356,7 +356,7 @@ typedef struct _MIDL_SYNTAX_INFO typedef void (__RPC_API *STUB_THUNK)( PMIDL_STUB_MESSAGE ); -#ifdef WINE_STRICT_PROTOTYPES +#ifndef WINE_NO_STRICT_PROTOTYPES typedef LONG (__RPC_API *SERVER_ROUTINE)(void); #else typedef LONG (__RPC_API *SERVER_ROUTINE)(); diff --git a/include/vfw.h b/include/vfw.h index cec5345b01e..762e6af8c1a 100644 --- a/include/vfw.h +++ b/include/vfw.h @@ -499,7 +499,7 @@ BOOL VFWAPI ICInstall(DWORD fccType, DWORD fccHandler, LPARAM lParam, LPSTR BOOL VFWAPI ICRemove(DWORD fccType, DWORD fccHandler, UINT wFlags); LRESULT VFWAPI ICGetInfo(HIC hic,ICINFO *picinfo, DWORD cb); HIC VFWAPI ICOpen(DWORD fccType, DWORD fccHandler, UINT wMode); -#ifdef WINE_STRICT_PROTOTYPES +#ifndef WINE_NO_STRICT_PROTOTYPES HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, DRIVERPROC lpfnHandler); #else HIC VFWAPI ICOpenFunction(DWORD fccType, DWORD fccHandler, UINT wMode, FARPROC lpfnHandler); diff --git a/include/wincrypt.h b/include/wincrypt.h index 0da94a31f73..c0e95f636ff 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -793,7 +793,7 @@ typedef struct _CRYPT_SMIME_CAPABILITIES { typedef struct _VTableProvStruc { DWORD Version; -#ifdef WINE_STRICT_PROTOTYPES +#ifndef WINE_NO_STRICT_PROTOTYPES BOOL (WINAPI *FuncVerifyImage)(LPCSTR,BYTE*); void (WINAPI *FuncReturnhWnd)(HWND*); #else diff --git a/include/windef.h b/include/windef.h index 78e4f56052c..79a96791151 100644 --- a/include/windef.h +++ b/include/windef.h @@ -248,7 +248,6 @@ typedef unsigned int DWORD, *PDWORD, *LPDWORD; #ifdef __WINESRC__ #define WINE_NO_UNICODE_MACROS 1 -#define WINE_STRICT_PROTOTYPES 1 #endif #ifdef WINE_NO_UNICODE_MACROS @@ -326,7 +325,7 @@ typedef HICON HCURSOR; /* Callback function pointers types */ -#ifdef WINE_STRICT_PROTOTYPES +#ifndef WINE_NO_STRICT_PROTOTYPES typedef INT_PTR (CALLBACK *FARPROC)(void); typedef INT_PTR (CALLBACK *NEARPROC)(void); typedef INT_PTR (CALLBACK *PROC)(void); diff --git a/include/wine/glu.h b/include/wine/glu.h index cb8b0934584..c5e2ef101cb 100644 --- a/include/wine/glu.h +++ b/include/wine/glu.h @@ -92,7 +92,7 @@ void APIENTRY gluLoadSamplingMatrices(GLUnurbs *nobj,const GLfloat modelMatrix[1 void APIENTRY gluNurbsProperty(GLUnurbs *nobj,GLenum property,GLfloat value); void APIENTRY gluGetNurbsProperty(GLUnurbs *nobj,GLenum property,GLfloat *value); -#ifdef WINE_STRICT_PROTOTYPES +#ifndef WINE_NO_STRICT_PROTOTYPES void APIENTRY gluQuadricCallback(GLUquadric *qobj,GLenum which,void (CALLBACK *fn)(void)); void APIENTRY gluTessCallback(GLUtesselator *tess,GLenum which,void (CALLBACK *fn)(void)); void APIENTRY gluNurbsCallback(GLUnurbs *nobj,GLenum which,void (CALLBACK *fn)(void)); diff --git a/include/wine/windef16.h b/include/wine/windef16.h index 40d96ee5706..2d6536fd46e 100644 --- a/include/wine/windef16.h +++ b/include/wine/windef16.h @@ -157,13 +157,7 @@ typedef BOOL16 (CALLBACK *PROPENUMPROC16)(HWND16,SEGPTR,HANDLE16); typedef VOID (CALLBACK *TIMERPROC16)(HWND16,UINT16,UINT16,DWORD); typedef LRESULT (CALLBACK *WNDENUMPROC16)(HWND16,LPARAM); typedef LRESULT (CALLBACK *WNDPROC16)(HWND16,UINT16,WPARAM16,LPARAM); - -#ifdef WINE_STRICT_PROTOTYPES typedef LRESULT (CALLBACK *FARPROC16)(void); typedef INT16 (CALLBACK *PROC16)(void); -#else -typedef LRESULT (CALLBACK *FARPROC16)(); -typedef INT16 (CALLBACK *PROC16)(); -#endif #endif /* __WINE_WINDEF16_H */