X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/820716c69f63230f43a2a2b3f39034f4e1d4d188..eeb0bee1d31939f8ff14a3c7dba6ff22fcdb6fff:/include/wx/mac/carbon/config_xcode.h

diff --git a/include/wx/mac/carbon/config_xcode.h b/include/wx/mac/carbon/config_xcode.h
index 04a1cac042..b9468165b0 100644
--- a/include/wx/mac/carbon/config_xcode.h
+++ b/include/wx/mac/carbon/config_xcode.h
@@ -40,14 +40,11 @@
 #define HAVE_PW_GECOS 1
 #define HAVE_GETTIMEOFDAY 1
 #define HAVE_FSYNC 1
-#define HAVE_LARGEFILE_SUPPORT 1
-#define HAVE_LOCALTIME 1
 #define HAVE_SCHED_YIELD 1
 #define HAVE_PTHREAD_MUTEXATTR_T 1
 #define HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL 1
 #define HAVE_PTHREAD_CANCEL 1
 #define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
-#define HAVE_SIGACTION 1
 #define HAVE_SNPRINTF 1
 #define HAVE_SNPRINTF_DECL 1
 #define HAVE_UNIX98_PRINTF 1
@@ -56,12 +53,10 @@
 #define HAVE_STRPTIME 1
 #define HAVE_STRPTIME_DECL 1
 #define HAVE_THREAD_PRIORITY_FUNCTIONS 1
-#define HAVE_TIMEGM 1
 #define HAVE_VSNPRINTF 1
 #define HAVE_VSNPRINTF_DECL 1
 #define HAVE_USLEEP 1
 #define HAVE_WCSLEN 1
-#define SIZEOF_CHAR 1
 #define SIZEOF_WCHAR_T 4
 #define SIZEOF_SHORT 2
 #define SIZEOF_INT 4
@@ -86,25 +81,25 @@
 #define HAVE_LOCALTIME_R 1
 #define HAVE_MKSTEMP 1
 #define HAVE_PUTENV 1
-#define HAVE_READDIR_R 1
 #define HAVE_STRTOK_R 1
 #define HAVE_UNAME 1
 #define HAVE_USLEEP 1
 #define HAVE_X11_XKBLIB_H 1
-#define HAVE_FNMATCH 1
-#define HAVE_FNMATCH_H 1
-#define HAVE_IOSTREAM 1
 #define HAVE_SCHED_H 1
 #define HAVE_UNISTD_H 1
 #define HAVE_WCHAR_H 1
-#define HAVE_ICONV 1
-#define ICONV_CONST 
+/* better to use the built-in CF conversions, also avoid iconv versioning problems */
+/* #undef HAVE_ICONV */
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
+#define ICONV_CONST const
+#else
+#define ICONV_CONST
+#endif
 #define HAVE_LANGINFO_H 1
 #define HAVE_WCSRTOMBS 1
 #define HAVE_FPUTWS 1
 #define HAVE_STRCASECMP_IN_STRING_H 1
 #define HAVE_WPRINTF 1
-#define HAVE_SWPRINTF 1
 #define HAVE_VSWPRINTF 1
 #define HAVE_FSEEKO 1
 #define HAVE_SYS_SELECT_H 1
@@ -112,9 +107,9 @@
 #define WXWIN_OS_DESCRIPTION "Darwin 7.9.0 Power Macintosh"
 #define PACKAGE_BUGREPORT "wx-dev@lists.wxwidgets.org"
 #define PACKAGE_NAME "wxWidgets"
-#define PACKAGE_STRING "wxWidgets 2.7.1"
+#define PACKAGE_STRING "wxWidgets 2.9.0"
 #define PACKAGE_TARNAME "wxwidgets"
-#define PACKAGE_VERSION "2.7.1"
+#define PACKAGE_VERSION "2.9.0"
 
 // for regex
 #define WX_NO_REGEX_ADVANCED 1