Checking for wxUSE_SOCKETS and __GSOCKET_STANDALONE__ should be right, now

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gsocket.h b/include/wx/gsocket.h
index ecc65f37f636d7f86114a8f57fbae5474b8d1039..10eb21f79e7b08a779516523d366498e8f56475c 100644 (file)
--- a/include/wx/gsocket.h
+++ b/include/wx/gsocket.h
@@ -8,9 +8,11 @@
 #ifndef __GSOCKET_H
 #define __GSOCKET_H
 
+#ifndef __GSOCKET_STANDALONE__
 #include "wx/setup.h"
+#endif
 
-#if wxUSE_SOCKETS
+#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
 #include <stddef.h>
 #include <sys/types.h>
@@ -247,6 +249,6 @@ GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf);
 #endif /* __cplusplus */
 
 
-#endif    /* wxUSE_SOCKETS */
+#endif    /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
 
 #endif    /* __GSOCKET_H */

diff --git a/include/wx/msw/gsockmsw.h b/include/wx/msw/gsockmsw.h
index 38105d5fa281edfb6f73d4bff34ed6bd49c337e4..6cd735b092a05233d506622d84398ce04fddb28f 100644 (file)
--- a/include/wx/msw/gsockmsw.h
+++ b/include/wx/msw/gsockmsw.h
@@ -9,6 +9,12 @@
 #ifndef __GSOCK_MSW_H
 #define __GSOCK_MSW_H
 
+#ifndef __GSOCKET_STANDALONE__
+#include "wx/setup.h"
+#endif
+
+#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
+
 #ifndef __GSOCKET_STANDALONE__
 #include "wx/gsocket.h"
 #else
@@ -84,4 +90,6 @@ GSocketError _GAddress_Init_UNIX(GAddress *address);
 }
 #endif
 
+#endif  /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */
+
 #endif  /* __GSOCK_MSW_H */

diff --git a/src/msw/gsocket.c b/src/msw/gsocket.c
index 315a7e46c31cc7c07a9c12cf2e8b1eebd6b2e90d..34dcaa09f249d0f0c51830074d835e19b28bf42a 100644 (file)
--- a/src/msw/gsocket.c
+++ b/src/msw/gsocket.c
@@ -8,8 +8,14 @@
 
 
 #ifndef __GSOCKET_STANDALONE__
-
 #include "wx/setup.h"
+#endif
+
+#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
+
+
+#ifndef __GSOCKET_STANDALONE__
+
 #include "wx/msw/gsockmsw.h"
 #include "wx/gsocket.h"
 
@@ -29,8 +35,6 @@
 #endif /* __GSOCKET_STANDALONE__ */
 
 
-#if defined(__GSOCKET_STANDALONE__) || defined(wxUSE_SOCKETS)
-
 #include <assert.h>
 #include <string.h>
 #include <stdio.h>
@@ -1377,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__) */