diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2014-07-12 16:25:10 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2014-07-12 16:25:10 +0000 |
| commit | 2039f6b74df84ee50091647629f3c65b57371135 (patch) | |
| tree | 076e09339c1066da837771e8393ddab7ce9ff891 /sys/arch/sh/include | |
| parent | 30586300cf458635b5a017a2f2e7c7345538d628 (diff) | |
Tackle the endian.h mess. Make it so that:
* you can #include <sys/endian.h> instead of <machine/endian.h>,
and ditto <endian.h> (fixes code that pulls in <sys/endian.h> first)
* those will always export the symbols that POSIX specified for
<endian.h>, including the new {be,le}{16,32,64}toh() set. c.f.
http://austingroupbugs.net/view.php?id=162
if __BSD_VISIBLE then you also get the symbols that our <machine/endian.h>
currently exports (ntohs, NTOHS, dlg's bemtoh*, etc)
* when doing POSIX compiles (not __BSD_VISIBLE), then <netinet/in.h> and
<arpa/inet.h> will *stop* exporting the extra symbols like BYTE_ORDER
and betoh*
ok deraadt@
Diffstat (limited to 'sys/arch/sh/include')
| -rw-r--r-- | sys/arch/sh/include/endian.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/sh/include/endian.h b/sys/arch/sh/include/endian.h index 689b168d2ab..daba001f12b 100644 --- a/sys/arch/sh/include/endian.h +++ b/sys/arch/sh/include/endian.h @@ -1,4 +1,4 @@ -/* $OpenBSD: endian.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $ */ +/* $OpenBSD: endian.h,v 1.5 2014/07/12 16:25:09 guenther Exp $ */ /* $NetBSD: endian.h,v 1.4 2000/03/17 00:09:25 mycroft Exp $ */ /* Written by Manuel Bouyer. Public domain */ @@ -27,7 +27,7 @@ rval; \ }) -#define MD_SWAP +#define __HAVE_MD_SWAP #endif /* __GNUC_ */ @@ -36,8 +36,10 @@ #else #define _BYTE_ORDER _BIG_ENDIAN #endif -#include <sys/endian.h> - #define __STRICT_ALIGNMENT +#ifndef __FROM_SYS__ENDIAN +#include <sys/endian.h> +#endif + #endif /* !_SH_ENDIAN_H_ */ |