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

Merge macOS version-related fixes

Browse Source 
Notably fix build with pre-10.11 SDK.
This commit is contained in:
VZ
2016-11-29 00:53:33 +01:00
committed by GitHub
parent 90bd2523d1 295576f78f
commit ac31c85901
6 changed files with 27 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/osx/cocoa/chkconf.h
View File

@@ -11,17 +11,6 @@
#ifndef _WX_OSX_COCOA_CHKCONF_H_
#define _WX_OSX_COCOA_CHKCONF_H_
/* Many wchar functions (and also strnlen(), for some reason) are only
available since 10.7 so don't use them if we want to build the applications
that would run under 10.6 and earlier. */
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
#define HAVE_STRNLEN 1
#define HAVE_WCSDUP 1
#define HAVE_WCSNLEN 1
#define HAVE_WCSCASECMP 1
#define HAVE_WCSNCASECMP 1
#endif
/*
* native (1) or emulated (0) toolbar
*/
@@ -52,13 +41,10 @@
/*
Use the more efficient FSEvents API instead of kqueue
events for file system watcher, but only on OS X >= 10.7 since
that version introduced a flag that allows watching files as
well as sub directories.
events for file system watcher since that version introduced a flag that
allows watching files as well as sub directories.
*/
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
#define wxHAVE_FSEVENTS_FILE_NOTIFICATIONS 1
#endif
#define wxHAVE_FSEVENTS_FILE_NOTIFICATIONS 1
/*
* turning off capabilities that don't work under cocoa yet

7
include/wx/osx/config_xcode.h
View File

@@ -24,7 +24,6 @@
#define HAVE_VA_COPY 1
#define HAVE_VARIADIC_MACROS 1
#define HAVE_STD_WSTRING 1
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
#if __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 2 )
#if !defined(__has_include)
#define HAVE_TR1_UNORDERED_MAP 1
@@ -33,7 +32,6 @@
#endif
#define HAVE_GCC_ATOMIC_BUILTINS 1
#endif
#endif
#define HAVE_VISIBILITY 1
#define wxHAVE_PTHREAD_CLEANUP 1
#define CONST_COMPATIBILITY 0
@@ -59,6 +57,7 @@
#define HAVE_UNIX98_PRINTF 1
#define HAVE_STATFS 1
#define HAVE_STATFS_DECL 1
#define HAVE_STRNLEN 1
#define HAVE_STRPTIME 1
#define HAVE_STRPTIME_DECL 1
#define HAVE_STRTOULL 1
@@ -68,7 +67,11 @@
#define HAVE_VSSCANF 1
#define HAVE_VSSCANF_DECL 1
#define HAVE_USLEEP 1
#define HAVE_WCSCASECMP 1
#define HAVE_WCSDUP 1
#define HAVE_WCSLEN 1
#define HAVE_WCSNCASECMP 1
#define HAVE_WCSNLEN 1
#define SIZEOF_WCHAR_T 4
#define SIZEOF_SHORT 2
#define SIZEOF_INT 4