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

Move HAVE_WCSXXX from wx/osx/config_xcode.h to wx/osx/chkconf.h.

Browse Source 
The latter file is also used when building from the command line while the
former is only used in Xcode build, as its name indicates (which didn't help
me to notice it, however).

Also restore the test for wcsftime() in configure as it is available even on
older systems but do not test for strnlen() -- as it is not.

These changes amend those of r74523.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-07-15 16:42:10 +00:00
parent f2d8a2767e
commit 92e839baa4
4 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,17 @@
#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
*/

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

@@ -74,17 +74,6 @@
#define HAVE_VSSCANF_DECL 1
#define HAVE_USLEEP 1
#define HAVE_WCSLEN 1
/* Many wchar functions 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_WCSDUP 1
#define HAVE_WCSFTIME 1
#define HAVE_WCSNLEN 1
#define HAVE_WCSCASECMP 1
#define HAVE_WCSNCASECMP 1
#endif
#define SIZEOF_WCHAR_T 4
#define SIZEOF_SHORT 2
#define SIZEOF_INT 4