2007-09-07 Jeff Johnston <jjohnstn@redhat.com>

* libc/include/sys/_types.h: Protect all types with flag
        checks to allow definition in machine/_types.h.
This commit is contained in:
Jeff Johnston 2007-09-07 21:24:55 +00:00
parent 36fe6da675
commit e5ae72300f
2 changed files with 18 additions and 0 deletions

View File

@ -1,3 +1,8 @@
2007-09-07 Jeff Johnston <jjohnstn@redhat.com>
* libc/include/sys/_types.h: Protect all types with flag
checks to allow definition in machine/_types.h.
2007-09-07 Jeff Johnston <jjohnstn@redhat.com> 2007-09-07 Jeff Johnston <jjohnstn@redhat.com>
* libc/sys/linux/sys/_types.h: Add _fpos_t and _fpos64_t * libc/sys/linux/sys/_types.h: Add _fpos_t and _fpos64_t

View File

@ -12,8 +12,13 @@
#include <machine/_types.h> #include <machine/_types.h>
#include <sys/lock.h> #include <sys/lock.h>
#ifndef __OFF_T_DEFINED
typedef long _off_t; typedef long _off_t;
#endif
#ifndef __OFF64_T_DEFINED
__extension__ typedef long long _off64_t; __extension__ typedef long long _off64_t;
#endif
/* /*
* We need fpos_t for the following, but it doesn't have a leading "_", * We need fpos_t for the following, but it doesn't have a leading "_",
@ -30,15 +35,18 @@ typedef _off64_t _fpos64_t;
#endif #endif
#endif #endif
#ifndef __SSIZE_T_DEFINED
#if defined(__INT_MAX__) && __INT_MAX__ == 2147483647 #if defined(__INT_MAX__) && __INT_MAX__ == 2147483647
typedef int _ssize_t; typedef int _ssize_t;
#else #else
typedef long _ssize_t; typedef long _ssize_t;
#endif #endif
#endif
#define __need_wint_t #define __need_wint_t
#include <stddef.h> #include <stddef.h>
#ifndef __MBSTATE_T_DEFINED
/* Conversion state information. */ /* Conversion state information. */
typedef struct typedef struct
{ {
@ -49,10 +57,15 @@ typedef struct
unsigned char __wchb[4]; unsigned char __wchb[4];
} __value; /* Value so far. */ } __value; /* Value so far. */
} _mbstate_t; } _mbstate_t;
#endif
#ifndef __FLOCK_T_DEFINED
typedef _LOCK_RECURSIVE_T _flock_t; typedef _LOCK_RECURSIVE_T _flock_t;
#endif
#ifndef __ICONV_T_DEFINED
/* Iconv descriptor type */ /* Iconv descriptor type */
typedef void *_iconv_t; typedef void *_iconv_t;
#endif
#endif /* _SYS__TYPES_H */ #endif /* _SYS__TYPES_H */