2002-09-05 Kazuhiro Fujieda <fujieda@jaist.ac.jp>

        * libc/include/wchar.h (WCHAR_MAX): Only define if not already
        defined.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 2f6ad7bf07eb0003c96537bfaf33dc51da72907e..12a7376d4efe008ef101575a03d162120f474411 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-05  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
+
+       * libc/include/wchar.h (WCHAR_MAX): Only define if not already
+       defined.
+
 2002-09-04  Kazuhiro Fujieda  <fujieda@jaist.ac.jp>
 
         * libc/include/sys/config.h: Define accordingly __WCHAR_MAX__.

diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h
index ec95162a2582bcda0ceee3413c10a54fedd15a27..4cefc5d0ae223e670e1961bdf79d94df33800656 100644 (file)
--- a/newlib/libc/include/wchar.h
+++ b/newlib/libc/include/wchar.h
@@ -23,11 +23,13 @@
 #define WCHAR_MIN 0
 #endif
 
+#ifndef WCHAR_MAX
 #ifdef __WCHAR_MAX__
 #define WCHAR_MAX __WCHAR_MAX__
 #else
 #define WCHAR_MAX 0x7fffffffu
 #endif
+#endif
 
 #ifndef MBSTATE_T
 #define MBSTATE_T