projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add wxImage::InitAllHandlers()
[wxWidgets.git]
/
src
/
msw
/
gsocket.c
diff --git
a/src/msw/gsocket.c
b/src/msw/gsocket.c
index 350c4a8bbd7150975b36a3c979df06112519b401..8b10260d76fd21a5fd790a1055ebdaa07ff1c24b 100644
(file)
--- a/
src/msw/gsocket.c
+++ b/
src/msw/gsocket.c
@@
-6,15
+6,20
@@
* -------------------------------------------------------------------------
*/
* -------------------------------------------------------------------------
*/
-#if defined(__GSOCKET_STANDALONE__) || defined(wxUSE_SOCKETS)
#ifndef __GSOCKET_STANDALONE__
#ifndef __GSOCKET_STANDALONE__
-
#include "wx/setup.h"
#include "wx/setup.h"
+#endif
+
+#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
+
+
+#ifndef __GSOCKET_STANDALONE__
+
#include "wx/msw/gsockmsw.h"
#include "wx/gsocket.h"
#include "wx/msw/gsockmsw.h"
#include "wx/gsocket.h"
-#define INSTANCE wx
hInstance
+#define INSTANCE wx
GetInstance()
#else
#else
@@
-1376,7
+1381,7
@@
GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf)
}
}
-#endif /*
defined(__GSOCKET_STANDALONE__) || defined(wxUSE_SOCKETS
) */
+#endif /*
wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__
) */