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>
This commit is contained in:
Sebastian Huber
2016-04-13 13:10:15 +02:00
committed by Corinna Vinschen
parent eb6f1d7b77
commit 477463a201
14 changed files with 40 additions and 46 deletions

View File

@ -51,4 +51,11 @@ typedef struct
typedef struct { __flock_mutex_t mutex; } _flock_t;
#define _CLOCK_T_ unsigned long /* clock() */
#define _TIME_T_ long /* time() */
#define _CLOCKID_T_ unsigned long
#define _TIMER_T_ unsigned long
typedef long __suseconds_t; /* microseconds (signed) */
#endif /* _SYS__TYPES_H */

View File

@ -54,7 +54,6 @@
#include <stddef.h>
#include <sys/config.h>
#include <features.h>
#include <machine/types.h>
#include <sys/_types.h>
#if !defined(__time_t_defined) && !defined(_TIME_T)

View File

@ -5,9 +5,6 @@
#ifndef _MACHINE__TYPES_H
#define _MACHINE__TYPES_H
/* This disables some conflicting type definitions in <machine/types.h> */
#define _HAVE_SYSTYPES
#include <machine/_default_types.h>
typedef __int32_t blksize_t;

View File

@ -1,7 +1,7 @@
#ifndef _SYS_TIME_H
#define _SYS_TIME_H
#include <machine/types.h>
#include <sys/_types.h>
#ifndef __time_t_defined
typedef _TIME_T_ time_t;