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

Move HAVE_<strfunc> definitions to wx/osx/config_xcode.h

Browse Source 
They are not needed in wx/osx/cocoa/chkconf.h as they are detected by
configure normally, so only define them when using Xcode.
This commit is contained in:
Vadim Zeitlin
2016-11-26 17:15:54 +01:00
parent cb2474f040
commit 2638869fc7
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,17 +11,6 @@
#ifndef _WX_OSX_COCOA_CHKCONF_H_ #ifndef _WX_OSX_COCOA_CHKCONF_H_
#define _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 * native (1) or emulated (0) toolbar
*/ */

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

@@ -59,6 +59,7 @@
#define HAVE_UNIX98_PRINTF 1 #define HAVE_UNIX98_PRINTF 1
#define HAVE_STATFS 1 #define HAVE_STATFS 1
#define HAVE_STATFS_DECL 1 #define HAVE_STATFS_DECL 1
#define HAVE_STRNLEN 1
#define HAVE_STRPTIME 1 #define HAVE_STRPTIME 1
#define HAVE_STRPTIME_DECL 1 #define HAVE_STRPTIME_DECL 1
#define HAVE_STRTOULL 1 #define HAVE_STRTOULL 1
@@ -68,7 +69,11 @@
#define HAVE_VSSCANF 1 #define HAVE_VSSCANF 1
#define HAVE_VSSCANF_DECL 1 #define HAVE_VSSCANF_DECL 1
#define HAVE_USLEEP 1 #define HAVE_USLEEP 1
#define HAVE_WCSCASECMP 1
#define HAVE_WCSDUP 1
#define HAVE_WCSLEN 1 #define HAVE_WCSLEN 1
#define HAVE_WCSNCASECMP 1
#define HAVE_WCSNLEN 1
#define SIZEOF_WCHAR_T 4 #define SIZEOF_WCHAR_T 4
#define SIZEOF_SHORT 2 #define SIZEOF_SHORT 2
#define SIZEOF_INT 4 #define SIZEOF_INT 4