From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 17 Jun 2012 21:35:14 +0000 (+0000)
Subject: Fixes for building wxGTK under Cygwin.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/acbed1149ebf94262e92f752faf8d7326238f2a6?hp=954fd05108895d26b0d3f7a298673179a1dcdbaa

Fixes for building wxGTK under Cygwin.

Test for __WXMSW__ instead of __CYGWIN__ to not affect building non-MSW ports
such as wxGTK under Cygwin.

See #14382.

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

diff --git a/include/wx/app.h b/include/wx/app.h
index 17b7a2c7a2..82b2868578 100644
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -494,7 +494,7 @@ protected:
     wxDECLARE_NO_COPY_CLASS(wxAppConsoleBase);
 };
 
-#if defined(__UNIX__) && !defined(__CYGWIN__)
+#if defined(__UNIX__) && !defined(__WXMSW__)
     #include "wx/unix/app.h"
 #else
     // this has to be a class and not a typedef as we forward declare it
diff --git a/include/wx/defs.h b/include/wx/defs.h
index f404e9ae21..87f0e4ec2b 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -217,7 +217,7 @@
 
 /* Prevents conflicts between sys/types.h and winsock.h with Cygwin, */
 /* when using Windows sockets. */
-#ifdef __CYGWIN__
+#if defined(__CYGWIN__) && defined(__WXMSW__)
 #define __USE_W32_SOCKETS
 #endif
 
diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h
index aafd2bce55..51cfd8ed23 100644
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -17,7 +17,7 @@
 
 // TODO: implement wxEventLoopSource for MSW (it should wrap a HANDLE and be
 //       monitored using MsgWaitForMultipleObjects())
-#if defined(__WXOSX__) || (defined(__UNIX__) && !defined(__CYGWIN__))
+#if defined(__WXOSX__) || (defined(__UNIX__) && !defined(__WXMSW__))
     #define wxUSE_EVENTLOOP_SOURCE 1
 #else
     #define wxUSE_EVENTLOOP_SOURCE 0
@@ -308,7 +308,7 @@ protected:
 #endif // wxUSE_GUI
 
 // include the header defining wxConsoleEventLoop for Unix systems
-#if defined(__UNIX__) && !defined(__CYGWIN__)
+#if defined(__UNIX__) && !defined(__WXMSW__)
 #include "wx/unix/evtloop.h"
 #endif
 
diff --git a/include/wx/private/socket.h b/include/wx/private/socket.h
index 3e934663a1..78e3e6351a 100644
--- 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.
  */
-#if !defined(__WXMAC__) && !defined(__CYGWIN__) && !defined(__WXWINCE__)
+#if !defined(__WXMAC__) && !defined(__WXMSW__) && !defined(__WXWINCE__)
 #include <sys/types.h>
 #endif
 
diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index ecee1e1770..ec572a2adb 100644
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -47,7 +47,7 @@
 
 #include <errno.h>
 
-#if defined(__UNIX__) && !defined(__CYGWIN__)
+#if defined(__UNIX__) && !defined(__WXMSW__)
     #include <netdb.h>
     #include <arpa/inet.h>
 #endif // __UNIX__