diff options
| author | mike <mike@FreeBSD.org> | 2002-08-21 16:20:02 +0000 |
|---|---|---|
| committer | mike <mike@FreeBSD.org> | 2002-08-21 16:20:02 +0000 |
| commit | 9e6f796b0d2083dcc48c062853660f96db0a3c8d (patch) | |
| tree | 7e9e16e835d265de592c113ee6c5d85f9be039cb /include/arpa | |
| parent | d5203d1ff8cef07eff72ad400fde5c759623752e (diff) | |
| download | FreeBSD-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/arpa')
| -rw-r--r-- | include/arpa/inet.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/arpa/inet.h b/include/arpa/inet.h index 13be871..41cbc11 100644 --- a/include/arpa/inet.h +++ b/include/arpa/inet.h @@ -59,7 +59,7 @@ /* External definitions for functions in inet(3), addr2ascii(3) */ #include <sys/cdefs.h> -#include <machine/ansi.h> +#include <sys/_types.h> /* Required for byteorder(3) functions. */ #include <machine/endian.h> @@ -88,9 +88,9 @@ typedef uint16_t in_port_t; #endif #if __BSD_VISIBLE -#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 #endif @@ -98,9 +98,9 @@ typedef _BSD_SIZE_T_ size_t; * XXX socklen_t is used by a POSIX.1-2001 interface, but not required by * POSIX.1-2001. */ -#ifdef _BSD_SOCKLEN_T_ -typedef _BSD_SOCKLEN_T_ socklen_t; -#undef _BSD_SOCKLEN_T_ +#ifndef _SOCKLEN_T_DECLARED +typedef __socklen_t socklen_t; +#define _SOCKLEN_T_DECLARED #endif #ifndef _STRUCT_IN_ADDR_DECLARED |
