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

Fixes for building wxMSW under Cygwin.

Browse Source 
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/branches/WX_3_0_BRANCH@76759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2014-06-24 02:47:13 +00:00
parent a6a5a97bc6
commit de6fa55214
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/changes.txt
View File

@@ -574,6 +574,14 @@ Major new features in this release
3.0.2: (released 2014-xx-xx)
----------------------------
wxMSW:
- Fix Cygwin 1.7 build.
3.0.1: (released 2014-06-15) 3.0.1: (released 2014-06-15)
---------------------------- ----------------------------

2
include/wx/app.h
View File

@@ -516,7 +516,7 @@ protected:
wxDECLARE_NO_COPY_CLASS(wxAppConsoleBase); wxDECLARE_NO_COPY_CLASS(wxAppConsoleBase);
}; };
#if defined(__UNIX__) && !defined(__WXMSW__) #if defined(__UNIX__) && !defined(__WINDOWS__)
#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

@@ -216,7 +216,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. */
#if defined(__CYGWIN__) && defined(__WXMSW__) #if defined(__CYGWIN__) && defined(__WINDOWS__)
#define __USE_W32_SOCKETS #define __USE_W32_SOCKETS
#endif #endif

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

@@ -20,7 +20,7 @@
// IsOpened() method. // IsOpened() method.
// //
// wxPipeOutputStream is similar but has no additional methods at all. // wxPipeOutputStream is similar but has no additional methods at all.
#ifdef __UNIX__ #if defined(__UNIX__) && !defined(__WINDOWS__)
#include "wx/unix/private/pipestream.h" #include "wx/unix/private/pipestream.h"
#elif defined(__WINDOWS__) && !defined(__WXWINCE__) #elif defined(__WINDOWS__) && !defined(__WXWINCE__)
#include "wx/msw/private/pipestream.h" #include "wx/msw/private/pipestream.h"

2
src/common/sckaddr.cpp
View File

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