X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb2e90c1745beb2c1db7bba7cf35587be392c819..c829d62b6945c74edaf25210720129b8b749639d:/src/msw/gsockmsw.c diff --git a/src/msw/gsockmsw.c b/src/msw/gsockmsw.c index 68d3d5f975..4ff547fe94 100644 --- a/src/msw/gsockmsw.c +++ b/src/msw/gsockmsw.c @@ -24,7 +24,7 @@ * RPCNOTIFICATION_ROUTINE */ #ifdef _MSC_VER -# pragma warning(disable:4115) /* named type definition in parentheses */ +# pragma warning(disable:4115) /* named type definition in parentheses */ #endif /* This needs to be before the wx/defs/h inclusion @@ -32,7 +32,20 @@ */ #ifdef __WXWINCE__ -#include + /* windows.h results in tons of warnings at max warning level */ +# ifdef _MSC_VER +# pragma warning(push, 1) + /* + "unreferenced inline function has been removed": this is not + suppressed by push above as it is given at the end of the + compilation unit + */ +# pragma warning(disable:4514) +# endif +# include +# ifdef _MSC_VER +# pragma warning(pop) +# endif #endif #ifndef __GSOCKET_STANDALONE__ @@ -99,7 +112,7 @@ wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc); #error "MAXSOCKETS is too big!" #endif -typedef int PASCAL (*WSAAsyncSelectFunc)(SOCKET,HWND,u_int,long); +typedef int (PASCAL *WSAAsyncSelectFunc)(SOCKET,HWND,u_int,long); /* Global variables */