synchronize GTK2 minimum version in docs

[wxWidgets.git] / include / wx / private / socket.h

diff --git a/include/wx/private/socket.h b/include/wx/private/socket.h
index 89a5bd00043f313f453ce1b90e6a133b851ce243..78e3e6351a47f1ed4400fb709f882ccc759756c6 100644 (file)
--- a/include/wx/private/socket.h
+++ b/include/wx/private/socket.h
@@ -51,7 +51,7 @@
    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.
  */
    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__)
+#if !defined(__WXMAC__) && !defined(__WXMSW__) && !defined(__WXWINCE__)

 #include <sys/types.h>
 #endif
 
 #include <sys/types.h>
 #endif
 


@@ -61,7 +61,7 @@
 
 // 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
 
 // 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__
+#ifdef __WINDOWS__

     #include "wx/msw/wrapwin.h"
 #else
     #include <sys/time.h>   // for timeval
     #include "wx/msw/wrapwin.h"
 #else
     #include <sys/time.h>   // for timeval


@@ -79,7 +79,7 @@
 
 // define some symbols which winsock.h defines but traditional BSD headers
 // don't
 
 // define some symbols which winsock.h defines but traditional BSD headers
 // don't

-#ifndef __WXMSW__
+#ifndef __WINDOWS__

     #define SOCKET int
 #endif
 
     #define SOCKET int
 #endif
 


@@ -367,7 +367,7 @@ private:
     wxDECLARE_NO_COPY_CLASS(wxSocketImpl);
 };
 
     wxDECLARE_NO_COPY_CLASS(wxSocketImpl);
 };
 

-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)

     #include "wx/msw/private/sockmsw.h"
 #else
     #include "wx/unix/private/sockunix.h"
     #include "wx/msw/private/sockmsw.h"
 #else
     #include "wx/unix/private/sockunix.h"