ICU-12766 fix AIX compile opts and uchar include

X-SVN-Rev: 39754

diff --git a/icu4c/source/common/unicode/umachine.h b/icu4c/source/common/unicode/umachine.h
index 3dab79a825fd9d4e132facda5f9b927d6e9fac45..fbd2bfe56868c19463c0b156ef0c0bb0b53e383f 100644 (file)
--- a/icu4c/source/common/unicode/umachine.h
+++ b/icu4c/source/common/unicode/umachine.h
@@ -290,6 +290,14 @@ typedef int8_t UBool;
 /** Number of bytes in a UChar. @stable ICU 2.0 */
 #define U_SIZEOF_UCHAR 2
 
+/**
+ * for AIX, uchar.h needs to be included
+ */
+#if (U_PLATFORM == U_PF_AIX) && defined(__cplusplus) &&(U_CPLUSPLUS_VERSION < 11)
+# include <uchar.h>
+#endif
+
+
 /**
  * \var UChar
  *

diff --git a/icu4c/source/config/mh-aix-va b/icu4c/source/config/mh-aix-va
index e1b423658d40fa1241e6a591f2701fc308ccd9af..b75dda4a17c94ebaa58dd5a4378865339bdfb8d2 100644 (file)
--- a/icu4c/source/config/mh-aix-va
+++ b/icu4c/source/config/mh-aix-va
@@ -13,8 +13,8 @@ GEN_DEPS.cc=  $(CXX) -E -M $(DEFS) $(CPPFLAGS)
 #           This helps in the data library,
 # -qproto assumes all functions are prototyped (for optimization)
 # -qrtti turns on compiler RTTI, required beginning with ICU 4.6
-CFLAGS += -qproto -qroconst
-CXXFLAGS += -qproto -qroconst -qrtti
+CFLAGS += -qproto -qroconst -qlanglvl=extended
+CXXFLAGS += -qproto -qroconst -qrtti -qlanglvl=extended0x
 
 # If you readd this line, you must change the SO value
 #LDFLAGS += -brtl