Move integer type definitions

This commit is contained in:
Sebastian Huber 2013-10-24 11:25:33 +02:00
parent 150d4d6524
commit e2281af9c8
3 changed files with 14 additions and 25 deletions

View File

@ -73,25 +73,6 @@
#define INET6 1 #define INET6 1
#define TCP_SIGNATURE 1 #define TCP_SIGNATURE 1
/* Integer type definitions */
#define __float_t float
#define __double_t double
#define __clock_t clock_t
#define __cpumask_t unsigned int
#define __critical_t intptr_t
#define __ptrdiff_t ptrdiff_t
#define __time_t time_t
#define _CLOCKID_T_DECLARED 1
#define _TIMER_T_DECLARED 1
#define _TIME_T_DECLARED 1
#define _USECONDS_T_DECLARED 1
#define _FSBLKCNT_T_DECLARED 1
#define _BLKSIZE_T_DECLARED 1
#define _BLKCNT_T_DECLARED 1
/* Symbol rename */ /* Symbol rename */
#include <machine/rtems-bsd-symbols.h> #include <machine/rtems-bsd-symbols.h>

View File

@ -128,13 +128,27 @@ typedef union {
typedef int boolean_t; typedef int boolean_t;
typedef clock_t __clock_t;
typedef unsigned int __cpumask_t;
typedef intptr_t __critical_t;
typedef struct device *device_t; typedef struct device *device_t;
typedef double __double_t;
typedef float __float_t;
typedef intptr_t intfptr_t; typedef intptr_t intfptr_t;
typedef uintptr_t uintfptr_t; typedef uintptr_t uintfptr_t;
typedef uint32_t intrmask_t; typedef uint32_t intrmask_t;
typedef time_t __time_t;
typedef ptrdiff_t __ptrdiff_t;
typedef char vm_memattr_t; typedef char vm_memattr_t;
#endif /* _KERNEL */ #endif /* _KERNEL */

View File

@ -107,7 +107,6 @@ typedef __uintptr_t uintptr_t;
#define _INTPTR_T_DECLARED #define _INTPTR_T_DECLARED
#endif #endif
#ifndef __rtems__
typedef __uint8_t u_int8_t; /* unsigned integrals (deprecated) */ typedef __uint8_t u_int8_t; /* unsigned integrals (deprecated) */
typedef __uint16_t u_int16_t; typedef __uint16_t u_int16_t;
typedef __uint32_t u_int32_t; typedef __uint32_t u_int32_t;
@ -118,7 +117,6 @@ typedef __int64_t quad_t;
typedef quad_t * qaddr_t; typedef quad_t * qaddr_t;
typedef char * caddr_t; /* core address */ typedef char * caddr_t; /* core address */
#endif /* __rtems__ */
typedef __const char * c_caddr_t; /* core address, pointer to const */ typedef __const char * c_caddr_t; /* core address, pointer to const */
typedef __volatile char *v_caddr_t; /* core address, pointer to volatile */ typedef __volatile char *v_caddr_t; /* core address, pointer to volatile */
@ -148,9 +146,7 @@ typedef __clockid_t clockid_t;
typedef __cpumask_t cpumask_t; typedef __cpumask_t cpumask_t;
typedef __critical_t critical_t; /* Critical section value */ typedef __critical_t critical_t; /* Critical section value */
#ifndef __rtems__
typedef __int64_t daddr_t; /* disk address */ typedef __int64_t daddr_t; /* disk address */
#endif /* __rtems__ */
#ifndef _DEV_T_DECLARED #ifndef _DEV_T_DECLARED
typedef __dev_t dev_t; /* device number or struct cdev */ typedef __dev_t dev_t; /* device number or struct cdev */
@ -307,9 +303,7 @@ typedef __uint64_t uoff_t;
typedef char vm_memattr_t; /* memory attribute codes */ typedef char vm_memattr_t; /* memory attribute codes */
typedef struct vm_page *vm_page_t; typedef struct vm_page *vm_page_t;
#ifndef __rtems__
#define offsetof(type, field) __offsetof(type, field) #define offsetof(type, field) __offsetof(type, field)
#endif /* __rtems__ */
#endif /* !_KERNEL */ #endif /* !_KERNEL */