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
This commit is contained in:
@@ -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 */
|
||||
|
@@ -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 */
|
||||
|
@@ -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__) */
|
||||
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user