From 271e8ab62ee175c2ce6b550d1b949fef6977fa8a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 8 Aug 2015 01:29:35 +0200 Subject: [PATCH] Don't compile Carbon wxGetOsVersion() as part of wxOSX/Cocoa. It was already excluded for wxiOS, and this function has also a Cocoa-specific implementation since 411027d5b4a2d4398aabc756f71fec0bf1fa77b0, so don't compile it twice. See https://github.com/wxWidgets/wxWidgets/pull/62 --- src/osx/core/utilsexc_base.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osx/core/utilsexc_base.cpp b/src/osx/core/utilsexc_base.cpp index 3f325b3683..182f390a29 100644 --- a/src/osx/core/utilsexc_base.cpp +++ b/src/osx/core/utilsexc_base.cpp @@ -53,7 +53,7 @@ extern WXDLLIMPEXP_BASE wxSocketManager *wxOSXSocketManagerCF; wxSocketManager *wxOSXSocketManagerCF = NULL; #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 wxOperatingSystemId wxGetOsVersion(int *majorVsn, int *minorVsn)