compilation fix after incorrectly resolved conflict

[wxWidgets.git] / include / wx / gsocket.h

diff --git a/include/wx/gsocket.h b/include/wx/gsocket.h
index ecc65f37f636d7f86114a8f57fbae5474b8d1039..e5a9070209c0f5b106f299c6a5fae3445ea3dc63 100644 (file)
--- a/include/wx/gsocket.h
+++ b/include/wx/gsocket.h
@@ -8,15 +8,17 @@
 #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>
 
 #if !defined(__cplusplus)
-typedef int bool;
+typedef unsigned int bool;
 #endif
 
 #ifndef TRUE
@@ -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 */