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

Don't compile Carbon wxGetOsVersion() as part of wxOSX/Cocoa.

Browse Source 
It was already excluded for wxiOS, and this function has also a Cocoa-specific
implementation since 411027d5b4, so don't
compile it twice.

See https://github.com/wxWidgets/wxWidgets/pull/62
This commit is contained in:
Vadim Zeitlin
2015-08-08 01:29:35 +02:00
parent 03d9c427e0
commit 271e8ab62e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osx/core/utilsexc_base.cpp
View File

@@ -53,7 +53,7 @@ extern WXDLLIMPEXP_BASE wxSocketManager *wxOSXSocketManagerCF;
wxSocketManager *wxOSXSocketManagerCF = NULL; wxSocketManager *wxOSXSocketManagerCF = NULL;
#endif // wxUSE_SOCKETS #endif // wxUSE_SOCKETS
#if ( !wxUSE_GUI && !wxOSX_USE_IPHONE ) || wxOSX_USE_CARBON #if wxOSX_USE_CARBON
// our OS version is the same in non GUI and GUI cases // our OS version is the same in non GUI and GUI cases
wxOperatingSystemId wxGetOsVersion(int *majorVsn, int *minorVsn) wxOperatingSystemId wxGetOsVersion(int *majorVsn, int *minorVsn)