X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a9c22462aec446d06267ac10b99f1115704b9d1..ee3510132b8b4160f848bd4f502a6f5315f90dbc:/src/msw/gsockmsw.c diff --git a/src/msw/gsockmsw.c b/src/msw/gsockmsw.c index e853b8b1bd..c966cfffc1 100644 --- a/src/msw/gsockmsw.c +++ b/src/msw/gsockmsw.c @@ -20,6 +20,7 @@ #endif #ifndef __GSOCKET_STANDALONE__ +#include "wx/defs.h" #include "wx/setup.h" #endif @@ -38,7 +39,7 @@ #include "gsocket.h" /* If not using wxWindows, a global var called hInst must - * be available and it must containt the app's instance + * be available and it must contain the app's instance * handle. */ #define INSTANCE hInst @@ -58,8 +59,8 @@ # pragma warning(default:4115) /* named type definition in parentheses */ #endif -#define CLASSNAME "_GSocket_Internal_Window_Class" -#define WINDOWNAME "_GSocket_Internal_Window_Name" +#define CLASSNAME TEXT("_GSocket_Internal_Window_Class") +#define WINDOWNAME TEXT("_GSocket_Internal_Window_Name") /* Maximum number of different GSocket objects at a given time. * This value can be modified at will, but it CANNOT be greater @@ -82,7 +83,7 @@ static int firstAvailable; /* Global initializers */ -bool GSocket_Init(void) +int GSocket_Init(void) { WSADATA wsaData; WNDCLASS winClass; @@ -136,7 +137,7 @@ void GSocket_Cleanup(void) /* Per-socket GUI initialization / cleanup */ -bool _GSocket_GUI_Init(GSocket *socket) +int _GSocket_GUI_Init(GSocket *socket) { int i; @@ -278,10 +279,10 @@ void _GSocket_Disable_Events(GSocket *socket) #else /* !wxUSE_SOCKETS */ -/* +/* * Translation unit shouldn't be empty, so include this typedef to make the * compiler (VC++ 6.0, for example) happy */ -typedef (*wxDummy)(); +typedef void (*wxDummy)(); #endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */