From 2638869fc7c3d084a972d88d999c734c22b13211 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 26 Nov 2016 17:15:54 +0100 Subject: [PATCH] Move HAVE_ definitions to wx/osx/config_xcode.h They are not needed in wx/osx/cocoa/chkconf.h as they are detected by configure normally, so only define them when using Xcode. --- include/wx/osx/cocoa/chkconf.h | 11 ----------- include/wx/osx/config_xcode.h | 5 +++++ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/include/wx/osx/cocoa/chkconf.h b/include/wx/osx/cocoa/chkconf.h index 4cb5623b49..66357ab8aa 100644 --- a/include/wx/osx/cocoa/chkconf.h +++ b/include/wx/osx/cocoa/chkconf.h @@ -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 */ diff --git a/include/wx/osx/config_xcode.h b/include/wx/osx/config_xcode.h index 0146ec98b1..80b7fe6457 100644 --- a/include/wx/osx/config_xcode.h +++ b/include/wx/osx/config_xcode.h @@ -59,6 +59,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 +69,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