X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb2e90c1745beb2c1db7bba7cf35587be392c819..a76342da418c75ead546ce2025db24dad261d237:/src/msw/gsockmsw.c diff --git a/src/msw/gsockmsw.c b/src/msw/gsockmsw.c index 68d3d5f975..8e75239ea5 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,15 @@ */ #ifdef __WXWINCE__ -#include + /* windows.h results in tons of warnings at max warning level */ +# ifdef _MSC_VER +# pragma warning(push, 1) +# endif +# include +# ifdef _MSC_VER +# pragma warning(pop) +# pragma warning(disable:4514) +# endif #endif #ifndef __GSOCKET_STANDALONE__ @@ -55,7 +63,7 @@ HINSTANCE wxGetInstance(void); #include "gsockmsw.h" #include "gsocket.h" -/* If not using wxWindows, a global var called hInst must +/* If not using wxWidgets, a global var called hInst must * be available and it must contain the app's instance * handle. */ @@ -99,7 +107,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 */