summaryrefslogtreecommitdiffstats
path: root/include/stddef.h
diff options
context:
space:
mode:
authormike <mike@FreeBSD.org>2002-08-21 16:20:02 +0000
committermike <mike@FreeBSD.org>2002-08-21 16:20:02 +0000
commit9e6f796b0d2083dcc48c062853660f96db0a3c8d (patch)
tree7e9e16e835d265de592c113ee6c5d85f9be039cb /include/stddef.h
parentd5203d1ff8cef07eff72ad400fde5c759623752e (diff)
downloadFreeBSD-src-9e6f796b0d2083dcc48c062853660f96db0a3c8d.zip
FreeBSD-src-9e6f796b0d2083dcc48c062853660f96db0a3c8d.tar.gz
o Merge <machine/ansi.h> and <machine/types.h> into a new header
called <machine/_types.h>. o <machine/ansi.h> will continue to live so it can define MD clock macros, which are only MD because of gratuitous differences between architectures. o Change all headers to make use of this. This mainly involves changing: #ifdef _BSD_FOO_T_ typedef _BSD_FOO_T_ foo_t; #undef _BSD_FOO_T_ #endif to: #ifndef _FOO_T_DECLARED typedef __foo_t foo_t; #define _FOO_T_DECLARED #endif Concept by: bde Reviewed by: jake, obrien
Diffstat (limited to 'include/stddef.h')
-rw-r--r--include/stddef.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/include/stddef.h b/include/stddef.h
index 1e8dd2e..8400214 100644
--- a/include/stddef.h
+++ b/include/stddef.h
@@ -39,26 +39,26 @@
#define _STDDEF_H_
#include <sys/cdefs.h>
-#include <machine/ansi.h>
+#include <sys/_types.h>
-typedef _BSD_PTRDIFF_T_ ptrdiff_t;
+typedef __ptrdiff_t ptrdiff_t;
#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
-#ifdef _BSD_RUNE_T_
-typedef _BSD_RUNE_T_ rune_t;
-#undef _BSD_RUNE_T_
+#ifndef _RUNE_T_DECLARED
+typedef __rune_t rune_t;
+#define _RUNE_T_DECLARED
#endif
#endif
-#ifdef _BSD_SIZE_T_
-typedef _BSD_SIZE_T_ size_t;
-#undef _BSD_SIZE_T_
+#ifndef _SIZE_T_DECLARED
+typedef __size_t size_t;
+#define _SIZE_T_DECLARED
#endif
#ifndef __cplusplus
-#ifdef _BSD_WCHAR_T_
-typedef _BSD_WCHAR_T_ wchar_t;
-#undef _BSD_WCHAR_T_
+#ifndef _WCHAR_T_DECLARED
+typedef __wchar_t wchar_t;
+#define _WCHAR_T_DECLARED
#endif
#endif
OpenPOWER on IntegriCloud