diff options
| -rw-r--r-- | newlib/ChangeLog | 9 | ||||
| -rw-r--r-- | newlib/libc/include/sys/_types.h | 11 | ||||
| -rw-r--r-- | newlib/libc/include/wchar.h | 6 | ||||
| -rw-r--r-- | newlib/libc/sys/linux/sys/_types.h | 3 |
4 files changed, 12 insertions, 17 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 09b13a7..8fed9e5 100644 --- 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 1265c46..3d66f5a 100644 --- 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 4cefc5d..f75fe31 100644 --- 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 c37abc3..15ccf10 100644 --- 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 |