diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2016-04-13 14:10:15 +0300 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2016-04-13 14:30:27 +0300 |
commit | 477463a2011ba81907a753df9ce7a71b6563db54 (patch) | |
tree | 909f65c55a7c1d9f8421e2b77047482327e958a3 /winsup | |
parent | eb6f1d7b77b5a66f036f183d3cb9d4f157a09564 (diff) |
Eliminate use of Newlib-specific <machine/types.h>
This change solves a glibc/BSD compatibility problem.
glibc and BSD use double underscore types for internal types. The Linux
port of Newlib uses some glibc provided internal type definitions which
are not protected by guard defines, e.g. __off_t. To avoid a conflict
Newlib uses single underscore types for some internal types, e.g.
_off_t. However, for BSD compatibility we have to define the internal
types with double underscore names in <sys/_types.h>.
The header file <machine/types.h> is Newlib-specific. It was used
instead of <sys/_types.h> to provide the internal type definitions
_CLOCK_T, _TIME_T_, _CLOCKID_T_, _TIMER_T_, and __suseconds_t. Move
these definitions to <sys/_types.h> (there exist two instances of this
file, one for Linux and one for all other targets). This makes the
_HAVE_SYSTYPES configuration define obsolete (could possibly break the
__RDOS__ target). Use the standard <sys/_types.h> include throughout.
Move __loff_t defintion to default (non-Linux) <sys/_types.h>. Define
it via _off64_t to avoid a dependency on the compiler.
Provide the __off_t definition via default (non-Linux) <sys/_types.h>
based on _off_t for all systems except Cygwin. For Cygwin use _off64_t.
Define off_t via __off_t.
Provide the __pid_t definition via default (non-Linux) <sys/_types.h>.
This prevents a potential __pid_t and pid_t incompatibility. Add BSD
guard defines for pid_t.
Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>
Diffstat (limited to 'winsup')
-rw-r--r-- | winsup/cygwin/include/cygwin/types.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/winsup/cygwin/include/cygwin/types.h b/winsup/cygwin/include/cygwin/types.h index 61a1bb6d4..bdf40850a 100644 --- a/winsup/cygwin/include/cygwin/types.h +++ b/winsup/cygwin/include/cygwin/types.h @@ -34,12 +34,7 @@ typedef struct timespec timestruc_t; #ifndef __off_t_defined #define __off_t_defined -/* Based on the newlib definitions. */ -#if __WORDSIZE == 64 -typedef _off_t off_t; -#else -typedef _off64_t off_t; -#endif +typedef __off_t off_t; #endif /*__off_t_defined*/ typedef __loff_t loff_t; |