Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for building wxGTK under Cygwin.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2012-06-17 21:35:14 +00:00
parent 954fd05108
commit acbed1149e
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/app.h
View File

@@ -494,7 +494,7 @@ protected:
wxDECLARE_NO_COPY_CLASS(wxAppConsoleBase); wxDECLARE_NO_COPY_CLASS(wxAppConsoleBase);
}; };
#if defined(__UNIX__) && !defined(__CYGWIN__) #if defined(__UNIX__) && !defined(__WXMSW__)
#include "wx/unix/app.h" #include "wx/unix/app.h"
#else #else
// this has to be a class and not a typedef as we forward declare it // this has to be a class and not a typedef as we forward declare it

2
include/wx/defs.h
View File

@@ -217,7 +217,7 @@
/* Prevents conflicts between sys/types.h and winsock.h with Cygwin, */ /* Prevents conflicts between sys/types.h and winsock.h with Cygwin, */
/* when using Windows sockets. */ /* when using Windows sockets. */
#ifdef __CYGWIN__ #if defined(__CYGWIN__) && defined(__WXMSW__)
#define __USE_W32_SOCKETS #define __USE_W32_SOCKETS
#endif #endif

4
include/wx/evtloop.h
View File

@@ -17,7 +17,7 @@
// TODO: implement wxEventLoopSource for MSW (it should wrap a HANDLE and be // TODO: implement wxEventLoopSource for MSW (it should wrap a HANDLE and be
// monitored using MsgWaitForMultipleObjects()) // monitored using MsgWaitForMultipleObjects())
#if defined(__WXOSX__) || (defined(__UNIX__) && !defined(__CYGWIN__)) #if defined(__WXOSX__) || (defined(__UNIX__) && !defined(__WXMSW__))
#define wxUSE_EVENTLOOP_SOURCE 1 #define wxUSE_EVENTLOOP_SOURCE 1
#else #else
#define wxUSE_EVENTLOOP_SOURCE 0 #define wxUSE_EVENTLOOP_SOURCE 0
@@ -308,7 +308,7 @@ protected:
#endif // wxUSE_GUI #endif // wxUSE_GUI
// include the header defining wxConsoleEventLoop for Unix systems // include the header defining wxConsoleEventLoop for Unix systems
#if defined(__UNIX__) && !defined(__CYGWIN__) #if defined(__UNIX__) && !defined(__WXMSW__)
#include "wx/unix/evtloop.h" #include "wx/unix/evtloop.h"
#endif #endif

2
include/wx/private/socket.h
View File

@@ -51,7 +51,7 @@
having been defined in sys/types.h" when winsock.h is included later and 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. 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> #include <sys/types.h>
#endif #endif

2
src/common/sckaddr.cpp
View File

@@ -47,7 +47,7 @@
#include <errno.h> #include <errno.h>
#if defined(__UNIX__) && !defined(__CYGWIN__) #if defined(__UNIX__) && !defined(__WXMSW__)
#include <netdb.h> #include <netdb.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#endif // __UNIX__ #endif // __UNIX__