From: Vadim Zeitlin Date: Wed, 26 Nov 2008 12:21:56 +0000 (+0000) Subject: move wx/gsocket.h to wx/private/gsocket.h X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/04889c59c6d3c009d8150d5cfa6aa3f0dfa82daf move wx/gsocket.h to wx/private/gsocket.h git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/gsocket.h b/include/wx/gsocket.h deleted file mode 100644 index a1d76b9144..0000000000 --- a/include/wx/gsocket.h +++ /dev/null @@ -1,353 +0,0 @@ -/* ------------------------------------------------------------------------- - * Project: GSocket (Generic Socket) - * Name: gsocket.h - * Author: Guilhem Lavaux - * Guillermo Rodriguez Garcia - * Copyright: (c) Guilhem Lavaux - * (c) 2007,2008 Vadim Zeitlin - * Licence: wxWindows Licence - * Purpose: GSocket include file (system independent) - * CVSID: $Id$ - * ------------------------------------------------------------------------- - */ - -#ifndef _WX_GSOCKET_H_ -#define _WX_GSOCKET_H_ - -#include "wx/defs.h" - -#if wxUSE_SOCKETS - -#include "wx/dlimpexp.h" /* for WXDLLIMPEXP_NET */ - -class WXDLLIMPEXP_FWD_NET wxSocketBase; - -#include - -/* - Including sys/types.h under Cygwin results in the warnings about "fd_set - having been defined in sys/types.h" when winsock.h is included later and - doesn't seem to be necessary anyhow. It's not needed under Mac neither. - */ -#if !defined(__WXMAC__) && !defined(__CYGWIN__) && !defined(__WXWINCE__) -#include -#endif - -#ifdef __WXWINCE__ -#include -#endif - -// include the header defining timeval: under Windows this struct is used only -// with sockets so we need to include winsock.h which we do via windows.h -#ifdef __WXMSW__ - #include "wx/msw/wrapwin.h" -#else - #include // for timeval -#endif - -enum GAddressType -{ - GSOCK_NOFAMILY = 0, - GSOCK_INET, - GSOCK_INET6, - GSOCK_UNIX -}; - -enum GSocketStream -{ - GSOCK_STREAMED, - GSOCK_UNSTREAMED -}; - -enum GSocketError -{ - GSOCK_NOERROR = 0, - GSOCK_INVOP, - GSOCK_IOERR, - GSOCK_INVADDR, - GSOCK_INVSOCK, - GSOCK_NOHOST, - GSOCK_INVPORT, - GSOCK_WOULDBLOCK, - GSOCK_TIMEDOUT, - GSOCK_MEMERR, - GSOCK_OPTERR -}; - -/* See below for an explanation on how events work. - */ -enum GSocketEvent -{ - GSOCK_INPUT = 0, - GSOCK_OUTPUT = 1, - GSOCK_CONNECTION = 2, - GSOCK_LOST = 3, - GSOCK_MAX_EVENT = 4 -}; - -enum -{ - GSOCK_INPUT_FLAG = 1 << GSOCK_INPUT, - GSOCK_OUTPUT_FLAG = 1 << GSOCK_OUTPUT, - GSOCK_CONNECTION_FLAG = 1 << GSOCK_CONNECTION, - GSOCK_LOST_FLAG = 1 << GSOCK_LOST -}; - -typedef int GSocketEventFlags; - -struct GAddress; -class GSocket; - -typedef void (*GSocketCallback)(GSocket *socket, GSocketEvent event, - char *cdata); - -/* - Class providing hooks abstracting the differences between console and GUI - applications for socket code. - - We also have different implementations of this class for different platforms - allowing us to keep more things in the common code but the main reason for - its existence is that we want the same socket code work differently - depending on whether it's used from a console or a GUI program. This is - achieved by implementing the virtual methods of this class differently in - the objects returned by wxConsoleAppTraits::GetSocketFunctionsTable() and - the same method in wxGUIAppTraits. - */ -class GSocketManager -{ -public: - // set the manager to use, we don't take ownership of it - // - // this should be called before GSocket_Init(), i.e. before the first - // wxSocket object is created, otherwise the manager returned by - // wxAppTraits::GetSocketManager() will be used - static void Set(GSocketManager *manager); - - // return the manager to use - // - // this initializes the manager at first use - static GSocketManager *Get() - { - if ( !ms_manager ) - Init(); - - return ms_manager; - } - - // called before the first wxSocket is created and should do the - // initializations needed in order to use the network - // - // return true if initialized successfully - virtual bool OnInit() = 0; - - // undo the initializations of OnInit() - virtual void OnExit() = 0; - - - // do manager-specific socket initializations: called in the beginning of - // the socket initialization - virtual bool Init_Socket(GSocket *socket) = 0; - - // called when the socket is being closed - // - // TODO: merge this with Destroy_Socket(), currently 2 separate functions - // are needed because Init_Socket() always allocates manager-specific - // resources in GSocket and Destroy_Socket() must be called even if - // the socket has never been opened, but if the allocation were done - // on demand, then Destroy_Socket() could be called from - // GSocket::Close() and we wouldn't need Close_Socket() at all - virtual void Close_Socket(GSocket *socket) = 0; - - // undo Init_Socket(): called from GSocket dtor - virtual void Destroy_Socket(GSocket *socket) = 0; - - - // these functions enable or disable monitoring of the given socket for the - // specified events inside the currently running event loop (but notice - // that both BSD and Winsock implementations actually use socket->m_server - // value to determine what exactly should be monitored so it needs to be - // set before calling these functions) - virtual void Install_Callback(GSocket *socket, - GSocketEvent event = GSOCK_MAX_EVENT) = 0; - virtual void Uninstall_Callback(GSocket *socket, - GSocketEvent event = GSOCK_MAX_EVENT) = 0; - - virtual ~GSocketManager() { } - -private: - // get the manager to use if we don't have it yet - static void Init(); - - static GSocketManager *ms_manager; -}; - -/* - Base class providing functionality common to BSD and Winsock sockets. - - TODO: merge this in wxSocket itself, there is no reason to maintain the - separation between wxSocket and GSocket. - */ -class GSocketBase -{ -public: - // static factory function: creates the low-level socket associated with - // the given wxSocket (and inherits its attributes such as timeout) - static GSocket *Create(wxSocketBase& wxsocket); - - virtual ~GSocketBase(); - - void SetTimeout(unsigned long millisec); - - GSocketError SetLocal(GAddress *address); - GSocketError SetPeer(GAddress *address); - GAddress *GetLocal(); - GAddress *GetPeer(); - - GSocketEventFlags Select(GSocketEventFlags flags); - - virtual GSocket *WaitConnection(wxSocketBase& wxsocket) = 0; - - void Close(); - virtual void Shutdown(); - - void SetInitialSocketBuffers(int recv, int send) - { - m_initialRecvBufferSize = recv; - m_initialSendBufferSize = send; - } - - // notify m_wxsocket about the given socket event by calling its (inaptly - // named) OnRequest() method - void NotifyOnStateChange(GSocketEvent event); - - // FIXME: making these functions virtual is a hack necessary to make the - // wxBase library link without requiring wxNet under Unix where - // GSocketSelectManager (part of wxBase) uses them, they don't - // really need to be virtual at all - virtual void Detected_Read() { } - virtual void Detected_Write() { } - - // this is officially SOCKET (unsigned int) under Windows but we don't want - // to include winsock.h which defines SOCKET from here so just use int - // under all platforms - int m_fd; - - int m_initialRecvBufferSize; - int m_initialSendBufferSize; - - GAddress *m_local; - GAddress *m_peer; - GSocketError m_error; - - bool m_non_blocking; - bool m_server; - bool m_stream; - bool m_establishing; - bool m_reusable; - bool m_broadcast; - bool m_dobind; - - struct timeval m_timeout; - - GSocketEventFlags m_detected; - -protected: - GSocketBase(wxSocketBase& wxsocket); - -private: - // set in ctor and never changed except that it's reset to NULL when the - // socket is shut down - wxSocketBase *m_wxsocket; - - DECLARE_NO_COPY_CLASS(GSocketBase) -}; - -#if defined(__WINDOWS__) - #include "wx/msw/gsockmsw.h" -#else - #include "wx/unix/gsockunx.h" -#endif - -/* Global initializers */ - -/* GSocket_Init() must be called at the beginning (but after calling - * GSocketManager::Set() if a custom manager should be used) */ -bool GSocket_Init(); - -/* GSocket_Cleanup() must be called at the end */ -void GSocket_Cleanup(); - - -/* GAddress */ - -// Represents a socket endpoint, i.e. -- in spite of its name -- not an address -// but an (address, port) pair -struct GAddress -{ - struct sockaddr *m_addr; - size_t m_len; - - GAddressType m_family; - int m_realfamily; - - GSocketError m_error; -}; - -GAddress *GAddress_new(); -GAddress *GAddress_copy(GAddress *address); -void GAddress_destroy(GAddress *address); - -void GAddress_SetFamily(GAddress *address, GAddressType type); -GAddressType GAddress_GetFamily(GAddress *address); - -/* The use of any of the next functions will set the address family to - * the specific one. For example if you use GAddress_INET_SetHostName, - * address family will be implicitly set to AF_INET. - */ - -GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname); -GSocketError GAddress_INET_SetBroadcastAddress(GAddress *address); -GSocketError GAddress_INET_SetAnyAddress(GAddress *address); -GSocketError GAddress_INET_SetHostAddress(GAddress *address, - unsigned long hostaddr); -GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port, - const char *protocol); -GSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port); - -GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, - size_t sbuf); -unsigned long GAddress_INET_GetHostAddress(GAddress *address); -unsigned short GAddress_INET_GetPort(GAddress *address); - -GSocketError _GAddress_translate_from(GAddress *address, - struct sockaddr *addr, int len); -GSocketError _GAddress_translate_to (GAddress *address, - struct sockaddr **addr, int *len); -GSocketError _GAddress_Init_INET(GAddress *address); - -#if wxUSE_IPV6 - -GSocketError GAddress_INET6_SetHostName(GAddress *address, const char *hostname); -GSocketError GAddress_INET6_SetAnyAddress(GAddress *address); -GSocketError GAddress_INET6_SetHostAddress(GAddress *address, - struct in6_addr hostaddr); -GSocketError GAddress_INET6_SetPortName(GAddress *address, const char *port, - const char *protocol); -GSocketError GAddress_INET6_SetPort(GAddress *address, unsigned short port); - -GSocketError GAddress_INET6_GetHostName(GAddress *address, char *hostname, - size_t sbuf); -GSocketError GAddress_INET6_GetHostAddress(GAddress *address,struct in6_addr *hostaddr); -unsigned short GAddress_INET6_GetPort(GAddress *address); - -#endif // wxUSE_IPV6 - -// these functions are available under all platforms but only implemented under -// Unix ones, elsewhere they just return GSOCK_INVADDR -GSocketError _GAddress_Init_UNIX(GAddress *address); -GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path); -GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf); - -#endif /* wxUSE_SOCKETS */ - -#endif /* _WX_GSOCKET_H_ */ diff --git a/include/wx/private/gsocket.h b/include/wx/private/gsocket.h new file mode 100644 index 0000000000..f8379003ed --- /dev/null +++ b/include/wx/private/gsocket.h @@ -0,0 +1,351 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/private/gsocket.h +// Purpose: GSocket implementation +// Authors: Guilhem Lavaux, Vadim Zeitlin +// Created: April 1997 +// RCS-ID: $Id$ +// Copyright: (c) 1997 Guilhem Lavaux +// (c) 2008 Vadim Zeitlin +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + +#ifndef _WX_PRIVATE_GSOCKET_H_ +#define _WX_PRIVATE_GSOCKET_H_ + +#include "wx/defs.h" + +#if wxUSE_SOCKETS + +#include "wx/dlimpexp.h" /* for WXDLLIMPEXP_NET */ + +class WXDLLIMPEXP_FWD_NET wxSocketBase; + +#include + +/* + Including sys/types.h under Cygwin results in the warnings about "fd_set + having been defined in sys/types.h" when winsock.h is included later and + doesn't seem to be necessary anyhow. It's not needed under Mac neither. + */ +#if !defined(__WXMAC__) && !defined(__CYGWIN__) && !defined(__WXWINCE__) +#include +#endif + +#ifdef __WXWINCE__ +#include +#endif + +// include the header defining timeval: under Windows this struct is used only +// with sockets so we need to include winsock.h which we do via windows.h +#ifdef __WXMSW__ + #include "wx/msw/wrapwin.h" +#else + #include // for timeval +#endif + +enum GAddressType +{ + GSOCK_NOFAMILY = 0, + GSOCK_INET, + GSOCK_INET6, + GSOCK_UNIX +}; + +enum GSocketStream +{ + GSOCK_STREAMED, + GSOCK_UNSTREAMED +}; + +enum GSocketError +{ + GSOCK_NOERROR = 0, + GSOCK_INVOP, + GSOCK_IOERR, + GSOCK_INVADDR, + GSOCK_INVSOCK, + GSOCK_NOHOST, + GSOCK_INVPORT, + GSOCK_WOULDBLOCK, + GSOCK_TIMEDOUT, + GSOCK_MEMERR, + GSOCK_OPTERR +}; + +/* See below for an explanation on how events work. + */ +enum GSocketEvent +{ + GSOCK_INPUT = 0, + GSOCK_OUTPUT = 1, + GSOCK_CONNECTION = 2, + GSOCK_LOST = 3, + GSOCK_MAX_EVENT = 4 +}; + +enum +{ + GSOCK_INPUT_FLAG = 1 << GSOCK_INPUT, + GSOCK_OUTPUT_FLAG = 1 << GSOCK_OUTPUT, + GSOCK_CONNECTION_FLAG = 1 << GSOCK_CONNECTION, + GSOCK_LOST_FLAG = 1 << GSOCK_LOST +}; + +typedef int GSocketEventFlags; + +struct GAddress; +class GSocket; + +typedef void (*GSocketCallback)(GSocket *socket, GSocketEvent event, + char *cdata); + +/* + Class providing hooks abstracting the differences between console and GUI + applications for socket code. + + We also have different implementations of this class for different platforms + allowing us to keep more things in the common code but the main reason for + its existence is that we want the same socket code work differently + depending on whether it's used from a console or a GUI program. This is + achieved by implementing the virtual methods of this class differently in + the objects returned by wxConsoleAppTraits::GetSocketFunctionsTable() and + the same method in wxGUIAppTraits. + */ +class GSocketManager +{ +public: + // set the manager to use, we don't take ownership of it + // + // this should be called before GSocket_Init(), i.e. before the first + // wxSocket object is created, otherwise the manager returned by + // wxAppTraits::GetSocketManager() will be used + static void Set(GSocketManager *manager); + + // return the manager to use + // + // this initializes the manager at first use + static GSocketManager *Get() + { + if ( !ms_manager ) + Init(); + + return ms_manager; + } + + // called before the first wxSocket is created and should do the + // initializations needed in order to use the network + // + // return true if initialized successfully + virtual bool OnInit() = 0; + + // undo the initializations of OnInit() + virtual void OnExit() = 0; + + + // do manager-specific socket initializations: called in the beginning of + // the socket initialization + virtual bool Init_Socket(GSocket *socket) = 0; + + // called when the socket is being closed + // + // TODO: merge this with Destroy_Socket(), currently 2 separate functions + // are needed because Init_Socket() always allocates manager-specific + // resources in GSocket and Destroy_Socket() must be called even if + // the socket has never been opened, but if the allocation were done + // on demand, then Destroy_Socket() could be called from + // GSocket::Close() and we wouldn't need Close_Socket() at all + virtual void Close_Socket(GSocket *socket) = 0; + + // undo Init_Socket(): called from GSocket dtor + virtual void Destroy_Socket(GSocket *socket) = 0; + + + // these functions enable or disable monitoring of the given socket for the + // specified events inside the currently running event loop (but notice + // that both BSD and Winsock implementations actually use socket->m_server + // value to determine what exactly should be monitored so it needs to be + // set before calling these functions) + virtual void Install_Callback(GSocket *socket, + GSocketEvent event = GSOCK_MAX_EVENT) = 0; + virtual void Uninstall_Callback(GSocket *socket, + GSocketEvent event = GSOCK_MAX_EVENT) = 0; + + virtual ~GSocketManager() { } + +private: + // get the manager to use if we don't have it yet + static void Init(); + + static GSocketManager *ms_manager; +}; + +/* + Base class providing functionality common to BSD and Winsock sockets. + + TODO: merge this in wxSocket itself, there is no reason to maintain the + separation between wxSocket and GSocket. + */ +class GSocketBase +{ +public: + // static factory function: creates the low-level socket associated with + // the given wxSocket (and inherits its attributes such as timeout) + static GSocket *Create(wxSocketBase& wxsocket); + + virtual ~GSocketBase(); + + void SetTimeout(unsigned long millisec); + + GSocketError SetLocal(GAddress *address); + GSocketError SetPeer(GAddress *address); + GAddress *GetLocal(); + GAddress *GetPeer(); + + GSocketEventFlags Select(GSocketEventFlags flags); + + virtual GSocket *WaitConnection(wxSocketBase& wxsocket) = 0; + + void Close(); + virtual void Shutdown(); + + void SetInitialSocketBuffers(int recv, int send) + { + m_initialRecvBufferSize = recv; + m_initialSendBufferSize = send; + } + + // notify m_wxsocket about the given socket event by calling its (inaptly + // named) OnRequest() method + void NotifyOnStateChange(GSocketEvent event); + + // FIXME: making these functions virtual is a hack necessary to make the + // wxBase library link without requiring wxNet under Unix where + // GSocketSelectManager (part of wxBase) uses them, they don't + // really need to be virtual at all + virtual void Detected_Read() { } + virtual void Detected_Write() { } + + // this is officially SOCKET (unsigned int) under Windows but we don't want + // to include winsock.h which defines SOCKET from here so just use int + // under all platforms + int m_fd; + + int m_initialRecvBufferSize; + int m_initialSendBufferSize; + + GAddress *m_local; + GAddress *m_peer; + GSocketError m_error; + + bool m_non_blocking; + bool m_server; + bool m_stream; + bool m_establishing; + bool m_reusable; + bool m_broadcast; + bool m_dobind; + + struct timeval m_timeout; + + GSocketEventFlags m_detected; + +protected: + GSocketBase(wxSocketBase& wxsocket); + +private: + // set in ctor and never changed except that it's reset to NULL when the + // socket is shut down + wxSocketBase *m_wxsocket; + + DECLARE_NO_COPY_CLASS(GSocketBase) +}; + +#if defined(__WINDOWS__) + #include "wx/msw/gsockmsw.h" +#else + #include "wx/unix/gsockunx.h" +#endif + +/* Global initializers */ + +/* GSocket_Init() must be called at the beginning (but after calling + * GSocketManager::Set() if a custom manager should be used) */ +bool GSocket_Init(); + +/* GSocket_Cleanup() must be called at the end */ +void GSocket_Cleanup(); + + +/* GAddress */ + +// Represents a socket endpoint, i.e. -- in spite of its name -- not an address +// but an (address, port) pair +struct GAddress +{ + struct sockaddr *m_addr; + size_t m_len; + + GAddressType m_family; + int m_realfamily; + + GSocketError m_error; +}; + +GAddress *GAddress_new(); +GAddress *GAddress_copy(GAddress *address); +void GAddress_destroy(GAddress *address); + +void GAddress_SetFamily(GAddress *address, GAddressType type); +GAddressType GAddress_GetFamily(GAddress *address); + +/* The use of any of the next functions will set the address family to + * the specific one. For example if you use GAddress_INET_SetHostName, + * address family will be implicitly set to AF_INET. + */ + +GSocketError GAddress_INET_SetHostName(GAddress *address, const char *hostname); +GSocketError GAddress_INET_SetBroadcastAddress(GAddress *address); +GSocketError GAddress_INET_SetAnyAddress(GAddress *address); +GSocketError GAddress_INET_SetHostAddress(GAddress *address, + unsigned long hostaddr); +GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port, + const char *protocol); +GSocketError GAddress_INET_SetPort(GAddress *address, unsigned short port); + +GSocketError GAddress_INET_GetHostName(GAddress *address, char *hostname, + size_t sbuf); +unsigned long GAddress_INET_GetHostAddress(GAddress *address); +unsigned short GAddress_INET_GetPort(GAddress *address); + +GSocketError _GAddress_translate_from(GAddress *address, + struct sockaddr *addr, int len); +GSocketError _GAddress_translate_to (GAddress *address, + struct sockaddr **addr, int *len); +GSocketError _GAddress_Init_INET(GAddress *address); + +#if wxUSE_IPV6 + +GSocketError GAddress_INET6_SetHostName(GAddress *address, const char *hostname); +GSocketError GAddress_INET6_SetAnyAddress(GAddress *address); +GSocketError GAddress_INET6_SetHostAddress(GAddress *address, + struct in6_addr hostaddr); +GSocketError GAddress_INET6_SetPortName(GAddress *address, const char *port, + const char *protocol); +GSocketError GAddress_INET6_SetPort(GAddress *address, unsigned short port); + +GSocketError GAddress_INET6_GetHostName(GAddress *address, char *hostname, + size_t sbuf); +GSocketError GAddress_INET6_GetHostAddress(GAddress *address,struct in6_addr *hostaddr); +unsigned short GAddress_INET6_GetPort(GAddress *address); + +#endif // wxUSE_IPV6 + +// these functions are available under all platforms but only implemented under +// Unix ones, elsewhere they just return GSOCK_INVADDR +GSocketError _GAddress_Init_UNIX(GAddress *address); +GSocketError GAddress_UNIX_SetPath(GAddress *address, const char *path); +GSocketError GAddress_UNIX_GetPath(GAddress *address, char *path, size_t sbuf); + +#endif /* wxUSE_SOCKETS */ + +#endif /* _WX_PRIVATE_GSOCKET_H_ */ diff --git a/include/wx/private/gsocketiohandler.h b/include/wx/private/gsocketiohandler.h index 00c4cf3ea9..65f529d327 100644 --- a/include/wx/private/gsocketiohandler.h +++ b/include/wx/private/gsocketiohandler.h @@ -16,7 +16,7 @@ #if wxUSE_SOCKETS && wxUSE_SELECT_DISPATCHER #include "wx/private/selectdispatcher.h" -#include "wx/gsocket.h" +#include "wx/private/gsocket.h" class WXDLLIMPEXP_BASE wxGSocketIOHandler : public wxFDIOHandler { diff --git a/include/wx/socket.h b/include/wx/socket.h index 6107362658..8c40673a98 100644 --- a/include/wx/socket.h +++ b/include/wx/socket.h @@ -22,7 +22,7 @@ #include "wx/event.h" #include "wx/sckaddr.h" -#include "wx/gsocket.h" +#include "wx/private/gsocket.h" #include "wx/list.h" // ------------------------------------------------------------------------ diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp index dd801147b3..9c37cc6489 100644 --- a/src/common/sckaddr.cpp +++ b/src/common/sckaddr.cpp @@ -32,7 +32,7 @@ #endif #endif // !WX_PRECOMP -#include "wx/gsocket.h" +#include "wx/private/gsocket.h" #include "wx/socket.h" #include "wx/sckaddr.h" diff --git a/src/gtk/gsockgtk.cpp b/src/gtk/gsockgtk.cpp index 9a284628e1..0c034edfef 100644 --- a/src/gtk/gsockgtk.cpp +++ b/src/gtk/gsockgtk.cpp @@ -19,7 +19,7 @@ #include #include -#include "wx/gsocket.h" +#include "wx/private/gsocket.h" #include "wx/apptrait.h" extern "C" { diff --git a/src/gtk1/gsockgtk.cpp b/src/gtk1/gsockgtk.cpp index 9a284628e1..0c034edfef 100644 --- a/src/gtk1/gsockgtk.cpp +++ b/src/gtk1/gsockgtk.cpp @@ -19,7 +19,7 @@ #include #include -#include "wx/gsocket.h" +#include "wx/private/gsocket.h" #include "wx/apptrait.h" extern "C" { diff --git a/src/motif/gsockmot.cpp b/src/motif/gsockmot.cpp index 238c0cbca8..144eb61cd8 100644 --- a/src/motif/gsockmot.cpp +++ b/src/motif/gsockmot.cpp @@ -15,7 +15,7 @@ #include // XtAppAdd/RemoveInput() #include "wx/motif/private.h" // wxGetAppContext() -#include "wx/gsocket.h" +#include "wx/private/gsocket.h" #include "wx/apptrait.h" extern "C" { diff --git a/src/msw/gsocket.cpp b/src/msw/gsocket.cpp index cb88ba7af2..96af816836 100644 --- a/src/msw/gsocket.cpp +++ b/src/msw/gsocket.cpp @@ -57,7 +57,7 @@ #if wxUSE_SOCKETS -#include "wx/gsocket.h" +#include "wx/private/gsocket.h" #include "wx/link.h" wxFORCE_LINK_MODULE(gsockmsw) diff --git a/src/msw/gsockmsw.cpp b/src/msw/gsockmsw.cpp index f2cf192df8..dd9e757027 100644 --- a/src/msw/gsockmsw.cpp +++ b/src/msw/gsockmsw.cpp @@ -36,7 +36,7 @@ # pragma warning(disable:4115) /* named type definition in parentheses */ #endif -#include "wx/gsocket.h" +#include "wx/private/gsocket.h" #include "wx/apptrait.h" #include "wx/link.h" diff --git a/src/os2/gsockpm.cpp b/src/os2/gsockpm.cpp index a02d29ef6f..841675297d 100644 --- a/src/os2/gsockpm.cpp +++ b/src/os2/gsockpm.cpp @@ -12,7 +12,7 @@ #if wxUSE_SOCKETS #include -#include "wx/gsocket.h" +#include "wx/private/gsocket.h" #include "wx/app.h" #include "wx/apptrait.h" diff --git a/src/osx/core/gsockosx.cpp b/src/osx/core/gsockosx.cpp index b3b7114e9f..38bc5b1da8 100644 --- a/src/osx/core/gsockosx.cpp +++ b/src/osx/core/gsockosx.cpp @@ -10,7 +10,7 @@ #if wxUSE_SOCKETS -#include "wx/gsocket.h" +#include "wx/private/gsocket.h" #include "wx/apptrait.h" #include diff --git a/src/unix/gsocket.cpp b/src/unix/gsocket.cpp index 6efa6b76ad..fdda9ab843 100644 --- a/src/unix/gsocket.cpp +++ b/src/unix/gsocket.cpp @@ -16,7 +16,7 @@ #if wxUSE_SOCKETS -#include "wx/gsocket.h" +#include "wx/private/gsocket.h" #include "wx/private/fd.h" #include "wx/private/socket.h"