JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use __machine_*_t_defined for internal types

Browse Source 
Newlib defines defaults for internal types via <sys/_types.h> and uses
<machine/_types.h> to let targets define their own type if necessary.

Previously for example

	#ifndef __dev_t_defined
	typedef short __dev_t;
	#endif

However, the __*_t_defined pattern conflicts with the glibc type guard
pattern for user types, e.g. dev_t in this example.  Introduce a
__machine_*_t_defined pattern for internal types (defined by
<machine/_types.h>, used by <sys/_types.h>).  For example

	#ifndef __machine_dev_t_defined
	typedef short __dev_t;
	#endif

Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>
This commit is contained in:
Sebastian Huber
2016-04-15 13:44:12 +02:00
committed by Corinna Vinschen
parent 9f90ae0435
commit 8a5af1a184
6 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
newlib/libc/sys/rtems/include/machine/_types.h
View File

@ -1,35 +1,25 @@
/*
* $Id$
*/
#ifndef _MACHINE__TYPES_H
#define _MACHINE__TYPES_H
#define _MACHINE__TYPES_H
#include <machine/_default_types.h>
typedef __int32_t blksize_t;
typedef __int32_t blkcnt_t;
typedef __int32_t blksize_t;
typedef __int32_t blkcnt_t;
typedef __uint64_t __dev_t;
#define __dev_t_defined 1
typedef __uint64_t __dev_t;
#define __machine_dev_t_defined
#if defined(__arm__) || defined(__i386__) || defined(__m68k__) || defined(__mips__) || defined(__PPC__) || defined(__sparc__)
/* Use 64bit types */
typedef __int64_t _off_t;
#define __off_t_defined 1
typedef __int64_t _fpos_t;
#define __fpos_t_defined 1
typedef __int64_t _off_t;
#else
/* Use 32bit types */
typedef __int32_t _off_t;
#define __off_t_defined 1
typedef __int32_t _fpos_t;
#define __fpos_t_defined 1
typedef __int32_t _off_t;
#endif
#define __machine_off_t_defined
typedef __uint32_t _mode_t;
#define __mode_t_defined 1
typedef _off_t _fpos_t;
#define __machine_fpos_t_defined
#endif
typedef __uint32_t _mode_t;
#define __machine_mode_t_defined
#endif /* _MACHINE__TYPES_H */