diff options
| author | mike <mike@FreeBSD.org> | 2001-08-30 00:04:19 +0000 |
|---|---|---|
| committer | mike <mike@FreeBSD.org> | 2001-08-30 00:04:19 +0000 |
| commit | a45063618a1d6723c7f698850318bdd8b65f27a0 (patch) | |
| tree | 2a398220f9e238744c0dfb240b714a2129e1c526 /sys/sparc64 | |
| parent | 77d67fb5682dc550f62559210baf33988ee0f890 (diff) | |
| download | FreeBSD-src-a45063618a1d6723c7f698850318bdd8b65f27a0.zip FreeBSD-src-a45063618a1d6723c7f698850318bdd8b65f27a0.tar.gz | |
o Remove some GCCisms in src/powerpc/include/endian.h.
o Unify <machine/endian.h>'s across all architectures.
o Make bswapXX() functions use a different spelling of u_int16_t and
friends to reduce namespace pollution. The bswapXX() functions
don't actually exist, but we'll probably import these at some
point. Atleast one driver (if_de) depends on bswapXX() for big
endian cases.
o Deprecate byteorder(3) prototypes from <sys/types.h>, these are
now prototyped indirectly in <arpa/inet.h>.
o Deprecate in_addr_t and in_port_t typedefs in <sys/types.h>, these
are now typedef'd in <arpa/inet.h>.
o Change byteorder(3) prototypes to use standards compliant uint32_t
(spelled __uint32_t to reduce namespace pollution).
o Document new preferred headers and standards compliance.
Discussed with: bde
PR: 29946
Reviewed by: bmilekic
Diffstat (limited to 'sys/sparc64')
| -rw-r--r-- | sys/sparc64/include/ansi.h | 2 | ||||
| -rw-r--r-- | sys/sparc64/include/endian.h | 18 |
2 files changed, 12 insertions, 8 deletions
diff --git a/sys/sparc64/include/ansi.h b/sys/sparc64/include/ansi.h index 30b6e7d..47f5552 100644 --- a/sys/sparc64/include/ansi.h +++ b/sys/sparc64/include/ansi.h @@ -49,6 +49,8 @@ */ #define _BSD_CLOCK_T_ int /* clock() */ #define _BSD_CLOCKID_T_ int /* clock_gettime()... */ +#define _BSD_IN_ADDR_T_ __uint32_t /* inet(3) functions */ +#define _BSD_IN_PORT_T_ __uint16_t #define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */ #define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */ #define _BSD_RUNE_T_ _BSD_CT_RUNE_T_ /* rune_t (see below) */ diff --git a/sys/sparc64/include/endian.h b/sys/sparc64/include/endian.h index 0e8e1f1..b63b68e 100644 --- a/sys/sparc64/include/endian.h +++ b/sys/sparc64/include/endian.h @@ -47,17 +47,19 @@ #define BYTE_ORDER BIG_ENDIAN +#ifndef _KERNEL #include <sys/cdefs.h> -#include <sys/types.h> +#endif +#include <machine/ansi.h> __BEGIN_DECLS -in_addr_t htonl __P((in_addr_t)); -in_port_t htons __P((in_port_t)); -in_addr_t ntohl __P((in_addr_t)); -in_port_t ntohs __P((in_port_t)); -u_int16_t bswap16 __P((u_int16_t)); -u_int32_t bswap32 __P((u_int32_t)); -u_int64_t bswap64 __P((u_int64_t)); +__uint32_t htonl __P((__uint32_t)); +__uint16_t htons __P((__uint16_t)); +__uint32_t ntohl __P((__uint32_t)); +__uint16_t ntohs __P((__uint16_t)); +__uint16_t bswap16 __P((__uint16_t)); +__uint32_t bswap32 __P((__uint32_t)); +__uint64_t bswap64 __P((__uint64_t)); __END_DECLS /* |
