diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2002-09-04 22:16:55 +0400 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2002-09-04 22:16:55 +0400 |
| commit | efa077ce22ce17d6bfd6045e337121b0ff01935a (patch) | |
| tree | 681178f3fcbc3627fdfcad3f3ce24aee178596f2 | |
| parent | ca558bf047d7fc6f596902553fcf2e40c7fd6a42 (diff) | |
2002-09-04 Kazuhiro Fujieda <fujieda@jaist.ac.jp>
* libc/include/sys/config.h: Define accordingly __WCHAR_MAX__.
* libc/include/wchar.h: Define WCHAR_MIN as 0 and WCHAR_MAX as
__WCHAR_MAX__ or 0x7fffffffu.
* libc/string/wcscmp.c: Delete wrong and unnecessary type cast.
* libc/string/wcsncmp.c: Ditto.
| -rw-r--r-- | newlib/ChangeLog | 8 | ||||
| -rw-r--r-- | newlib/libc/include/sys/config.h | 7 | ||||
| -rw-r--r-- | newlib/libc/include/wchar.h | 10 |
3 files changed, 25 insertions, 0 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index fc4d4537e..2f6ad7bf0 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,11 @@ +2002-09-04 Kazuhiro Fujieda <fujieda@jaist.ac.jp> + + * libc/include/sys/config.h: Define accordingly __WCHAR_MAX__. + * libc/include/wchar.h: Define WCHAR_MIN as 0 and WCHAR_MAX as + __WCHAR_MAX__ or 0x7fffffffu. + * libc/string/wcscmp.c: Delete wrong and unnecessary type cast. + * libc/string/wcsncmp.c: Ditto. + 2002-09-03 Jeff Johnston <jjohnstn@redhat.com> * libc/string/wcschr.c: Add include of <stddef.h>. diff --git a/newlib/libc/include/sys/config.h b/newlib/libc/include/sys/config.h index d8bdc9c36..fd5e19bfa 100644 --- a/newlib/libc/include/sys/config.h +++ b/newlib/libc/include/sys/config.h @@ -170,4 +170,11 @@ #define _READ_WRITE_RETURN_TYPE int #endif +#ifndef __WCHAR_MAX__ +#if __INT_MAX__ == 32767 || defined(__CYGWIN__) || \ + defined (_WIN32) || defined(GO32) +#define __WCHAR_MAX__ 0xffffu +#endif +#endif + #endif /* __SYS_CONFIG_H__ */ diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h index 06c187e64..ec95162a2 100644 --- a/newlib/libc/include/wchar.h +++ b/newlib/libc/include/wchar.h @@ -19,6 +19,16 @@ # define WEOF ((wint_t)-1) #endif +#ifndef WCHAR_MIN +#define WCHAR_MIN 0 +#endif + +#ifdef __WCHAR_MAX__ +#define WCHAR_MAX __WCHAR_MAX__ +#else +#define WCHAR_MAX 0x7fffffffu +#endif + #ifndef MBSTATE_T #define MBSTATE_T typedef _mbstate_t mbstate_t; |