2002-09-16 Jeff Johnston <jjohnstn@redhat.com>

        * libc/include/wchar.h (mbstate_t): Change protective flag to
        be _MBSTATE_T.
        * libc/include/sys/_types.h (_mbstate_t): Remove protective flag.
        [__CYGWIN__]: Remove special code that defines mbstate_t and WEOF
        for Cygwin.
        * libc/sys/linux/sys/_types.h (_mbstate_t): Remove protective flag.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 09b13a74264a0931bf8ac93855fdb9e39de1d8a8..8fed9e53176cfd7d91f4f917ade0fa634f6cfc87 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,12 @@
+2002-09-16  Jeff Johnston  <jjohnstn@redhat.com>
+
+       * libc/include/wchar.h (mbstate_t): Change protective flag to
+       be _MBSTATE_T.
+       * libc/include/sys/_types.h (_mbstate_t): Remove protective flag.
+       [__CYGWIN__]: Remove special code that defines mbstate_t and WEOF
+       for Cygwin.
+       * libc/sys/linux/sys/_types.h (_mbstate_t): Remove protective flag.
+
 2002-09-11  Jeff Johnston  <jjohnstn@redhat.com>
 
         * acinclude.m4 (enable-newlib-mb): Change check to

diff --git a/newlib/libc/include/sys/_types.h b/newlib/libc/include/sys/_types.h
index 1265c46f50cba274312816ef39ca888130f8a4b7..3d66f5a0187eff1c615830766fde6c6ff23eb61b 100644 (file)
--- a/newlib/libc/include/sys/_types.h
+++ b/newlib/libc/include/sys/_types.h
@@ -21,8 +21,6 @@ typedef long _ssize_t;
 #define __need_wint_t
 #include <stddef.h>
 
-#ifndef _MBSTATE_T
-#define _MBSTATE_T
 /* Conversion state information.  */
 typedef struct
 {
@@ -33,15 +31,6 @@ typedef struct
     unsigned char __wchb[4];
   } __value;           /* Value so far.  */
 } _mbstate_t;
-#endif /* _MBSTATE_T */
-
-#ifdef __CYGWIN__
-# ifndef MBSTATE_T
-#  define MBSTATE_T
-typedef _mbstate_t mbstate_t;
-# endif /* MBSTATE_T */
-# define WEOF (0xffffffffu)
-#endif /* __CYGWIN__ */
 
 typedef int _flock_t;
 

diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h
index 4cefc5d0ae223e670e1961bdf79d94df33800656..f75fe31fc8cd7919c495c32939df5fb4ef633490 100644 (file)
--- a/newlib/libc/include/wchar.h
+++ b/newlib/libc/include/wchar.h
@@ -31,10 +31,10 @@
 #endif
 #endif
 
-#ifndef MBSTATE_T
-#define MBSTATE_T
+#ifndef _MBSTATE_T
+#define _MBSTATE_T
 typedef _mbstate_t mbstate_t;
-#endif /* MBSTATE_T */
+#endif /* _MBSTATE_T */
 
 wint_t _EXFUN(btowc, (int));
 int    _EXFUN(wctob, (wint_t));

diff --git a/newlib/libc/sys/linux/sys/_types.h b/newlib/libc/sys/linux/sys/_types.h
index c37abc37ed045a24acba48afe0fefc97c796581f..15ccf106153404678c4b9820a6e4e70d6c249a89 100644 (file)
--- a/newlib/libc/sys/linux/sys/_types.h
+++ b/newlib/libc/sys/linux/sys/_types.h
@@ -21,8 +21,6 @@ typedef long _ssize_t;
 #define __need_wint_t
 #include <stddef.h>
 
-#ifndef _MBSTATE_T
-#define _MBSTATE_T
 /* Conversion state information.  */
 typedef struct
 {
@@ -33,7 +31,6 @@ typedef struct
     unsigned char __wchb[4];
   } __value;           /* Value so far.  */
 } _mbstate_t;
-#endif /* _MBSTATE_T */
 
 struct __flock_t_tmp;
 typedef struct