From 9e804492abbf2ff2087fc952f4b0b98a6e3f8ba7 Mon Sep 17 00:00:00 2001 From: obrien Date: Wed, 16 May 2001 22:21:43 +0000 Subject: Move the int typedefs to the top so they can be used in defining other types. Ensure every platform has __offsetof. Make multiple inclusion detection consistent with other /include/*.h files. --- sys/arm/include/ansi.h | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) (limited to 'sys/arm') diff --git a/sys/arm/include/ansi.h b/sys/arm/include/ansi.h index 5c5780d..deac37c 100644 --- a/sys/arm/include/ansi.h +++ b/sys/arm/include/ansi.h @@ -34,8 +34,29 @@ * $FreeBSD$ */ -#ifndef _ANSI_H_ -#define _ANSI_H_ +#ifndef _MACHINE_ANSI_H_ +#define _MACHINE_ANSI_H_ + +/* + * Internal names for basic integral types. Omit the typedef if + * not possible for a machine/compiler combination. + */ +typedef __signed char __int8_t; +typedef unsigned char __uint8_t; +typedef short __int16_t; +typedef unsigned short __uint16_t; +typedef int __int32_t; +typedef unsigned int __uint32_t; +typedef long long __int64_t; +typedef unsigned long long __uint64_t; + +typedef int __intptr_t; +typedef unsigned int __uintptr_t; + +/* + * We define this here since both and needs it. + */ +#define __offsetof(type, field) ((size_t)(&((type *)0)->field)) /* * Types which are fundamental to the implementation and may appear in @@ -102,20 +123,4 @@ #define _BSD_CLK_TCK_ 100 #define _BSD_CLOCKS_PER_SEC_ 100 -/* - * Internal names for basic integral types. Omit the typedef if - * not possible for a machine/compiler combination. - */ -typedef __signed char __int8_t; -typedef unsigned char __uint8_t; -typedef short __int16_t; -typedef unsigned short __uint16_t; -typedef int __int32_t; -typedef unsigned int __uint32_t; -typedef long long __int64_t; -typedef unsigned long long __uint64_t; - -typedef int __intptr_t; -typedef unsigned int __uintptr_t; - -#endif /* _ANSI_H_ */ +#endif /* _MACHINE_ANSI_H_ */ -- cgit v1.1