Merge "Fix wchar.h not to redefine WCHAR_MAX/WCHAR_MIN"

2013-06-21 20:51:55 +00:00
parent 720848df0b f56a37e539
commit ae9621de63
3 changed files with 9 additions and 0 deletions
--- a/ndk/platforms/android-3/include/wchar.h
+++ b/ndk/platforms/android-3/include/wchar.h
@@ -70,8 +70,11 @@ typedef enum {
    WC_TYPE_MAX
 } wctype_t;

+#ifndef WCHAR_MAX
 #define  WCHAR_MAX   255
 #define  WCHAR_MIN   0
+#endif
+
 #define  WEOF        (-1)

 extern wint_t            btowc(int);
--- a/ndk/platforms/android-8/include/wchar.h
+++ b/ndk/platforms/android-8/include/wchar.h
@@ -70,8 +70,11 @@ typedef enum {
    WC_TYPE_MAX
 } wctype_t;

+#ifndef WCHAR_MAX
 #define  WCHAR_MAX   255
 #define  WCHAR_MIN   0
+#endif
+
 #define  WEOF        (-1)

 extern wint_t            btowc(int);
--- a/ndk/platforms/android-9/include/wchar.h
+++ b/ndk/platforms/android-9/include/wchar.h
@@ -71,8 +71,11 @@ typedef enum {
    WC_TYPE_MAX
 } wctype_t;

+#ifndef WCHAR_MAX
 #define  WCHAR_MAX   INT_MAX
 #define  WCHAR_MIN   INT_MIN
+#endif
+
 #define  WEOF        ((wint_t)(-1))

 extern wint_t            btowc(int);