From f56a37e539bdd4991e04ccabd9f8e63772f98175 Mon Sep 17 00:00:00 2001
From: Andrew Hsieh <andrewhsieh@google.com>
Date: Fri, 21 Jun 2013 11:11:35 -0700
Subject: [PATCH] Fix wchar.h not to redefine WCHAR_MAX/WCHAR_MIN

Change-Id: I6c6f2e020b72cce4c8665133ea0a0c5db977e348
---
 ndk/platforms/android-3/include/wchar.h | 3 +++
 ndk/platforms/android-8/include/wchar.h | 3 +++
 ndk/platforms/android-9/include/wchar.h | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/ndk/platforms/android-3/include/wchar.h b/ndk/platforms/android-3/include/wchar.h
index 9a6ce1de8..ecbf921fd 100644
--- 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);
diff --git a/ndk/platforms/android-8/include/wchar.h b/ndk/platforms/android-8/include/wchar.h
index b9c7b0b48..efe60bb74 100644
--- 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);
diff --git a/ndk/platforms/android-9/include/wchar.h b/ndk/platforms/android-9/include/wchar.h
index fea648c09..437f52b5b 100644
--- 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);