From dadc0ed341fbab69e29863cd2624bd51053c9502 Mon Sep 17 00:00:00 2001
From: Dimitri Schoolwerth <dimitri.schoolwerth@gmail.com>
Date: Tue, 24 Jun 2014 02:47:13 +0000
Subject: [PATCH] Fixes for building wxMSW under Cygwin.

Replace a few __WXMSW__ tests with __WINDOWS__ as the former is not
defined any longer (since r73290) when compiling with wxUSE_GUI set to 0.

Tested changes with both wxGTK and wxMSW builds under Cygwin.

Closes #14382.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/app.h                | 2 +-
 include/wx/defs.h               | 2 +-
 include/wx/private/pipestream.h | 2 +-
 src/common/sckaddr.cpp          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/wx/app.h b/include/wx/app.h
index 67f500de2f..5e31544b35 100644
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -516,7 +516,7 @@ protected:
     wxDECLARE_NO_COPY_CLASS(wxAppConsoleBase);
 };
 
-#if defined(__UNIX__) && !defined(__WXMSW__)
+#if defined(__UNIX__) && !defined(__WINDOWS__)
     #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 9e7353c76a..af282b8eed 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -193,7 +193,7 @@
 
 /* Prevents conflicts between sys/types.h and winsock.h with Cygwin, */
 /* when using Windows sockets. */
-#if defined(__CYGWIN__) && defined(__WXMSW__)
+#if defined(__CYGWIN__) && defined(__WINDOWS__)
 #define __USE_W32_SOCKETS
 #endif
 
diff --git a/include/wx/private/pipestream.h b/include/wx/private/pipestream.h
index f14d9aba79..7fdcb71760 100644
--- a/include/wx/private/pipestream.h
+++ b/include/wx/private/pipestream.h
@@ -20,7 +20,7 @@
 // IsOpened() method.
 //
 // wxPipeOutputStream is similar but has no additional methods at all.
-#ifdef __UNIX__
+#if defined(__UNIX__) && !defined(__WINDOWS__)
     #include "wx/unix/private/pipestream.h"
 #elif defined(__WINDOWS__) && !defined(__WXWINCE__)
     #include "wx/msw/private/pipestream.h"
diff --git a/src/common/sckaddr.cpp b/src/common/sckaddr.cpp
index 7a7b5f73c2..62badbc68b 100644
--- a/src/common/sckaddr.cpp
+++ b/src/common/sckaddr.cpp
@@ -46,7 +46,7 @@
 
 #include <errno.h>
 
-#if defined(__UNIX__) && !defined(__WXMSW__)
+#if defined(__UNIX__) && !defined(__WINDOWS__)
     #include <netdb.h>
     #include <arpa/inet.h>
 #endif // __UNIX__