X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ed2eb9afcb6559ad89caca8963e987d3f1151fdc..54081dc5c22c4ef292eb343b4c5b8821ac92dbbd:/src/msw/gsockmsw.c diff --git a/src/msw/gsockmsw.c b/src/msw/gsockmsw.c index b8a3bda683..d8ea3ae3c5 100644 --- a/src/msw/gsockmsw.c +++ b/src/msw/gsockmsw.c @@ -11,6 +11,14 @@ * PLEASE don't put C++ comments here - this is a C source file. */ +/* including rasasync.h (included from windows.h itself included from + * wx/setup.h and/or winsock.h results in this warning for + * RPCNOTIFICATION_ROUTINE + */ +#ifdef _MSC_VER +# pragma warning(disable:4115) /* named type definition in parentheses */ +#endif + #ifndef __GSOCKET_STANDALONE__ #include "wx/setup.h" #endif @@ -43,8 +51,13 @@ #include #include #include + #include +#ifdef _MSC_VER +# pragma warning(default:4115) /* named type definition in parentheses */ +#endif + #define CLASSNAME "_GSocket_Internal_Window_Class" #define WINDOWNAME "_GSocket_Internal_Window_Name" @@ -69,7 +82,7 @@ static int firstAvailable; /* Global initializers */ -bool GSocket_Init(void) +int GSocket_Init(void) { WSADATA wsaData; WNDCLASS winClass;