availability does not include any other headers, but it provides the necessary macros...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/config_xcode.h b/include/wx/mac/carbon/config_xcode.h
index 04a1cac042b222b08a4f63b18331167fdbfb1b96..0dc2440fbfa5af319dd94a6fef1ddcd0e689b33b 100644 (file)
--- a/include/wx/mac/carbon/config_xcode.h
+++ b/include/wx/mac/carbon/config_xcode.h
@@ -98,7 +98,11 @@
 #define HAVE_UNISTD_H 1
 #define HAVE_WCHAR_H 1
 #define HAVE_ICONV 1
-#define ICONV_CONST 
+#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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 324a77e876491f0a2616914585fd37aee9fd8420..2f5e5318fae835defaa50d139ace9486c8a74991 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -33,6 +33,7 @@
 #    if defined(__MACH__)
 #        define __WXMAC_OSX__
 #        define __WXMAC_CARBON__
+#        include <AvailabilityMacros.h>
 #        ifdef __WXMAC_XCODE__
 #            include <unistd.h>
 #            include "wx/mac/carbon/config_xcode.h"