summary refs log tree commit diff
path: root/bits
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-05-15 02:54:33 +0000
committerUlrich Drepper <drepper@redhat.com>2008-05-15 02:54:33 +0000
commit2f9a1be867489eb4fdc46e052163eb3cab99aef1 (patch)
tree61ce5241b637ef45b048ea4fc0485847b127bfc7 /bits
parentc8d49f05e7048f84bb8a60381c290f4831f3bd57 (diff)
downloadglibc-2f9a1be867489eb4fdc46e052163eb3cab99aef1.tar.gz
glibc-2f9a1be867489eb4fdc46e052163eb3cab99aef1.tar.xz
glibc-2f9a1be867489eb4fdc46e052163eb3cab99aef1.zip
[BZ #6442]
	* string/endian.h: Add macros for fixed-size endian conversion.
	* bits/byteswap.h: Allow inclusion from <endian.h>.
	* sysdeps/i386/bits/byteswap.h: Likewise.
	* sysdeps/ia64/bits/byteswap.h: Likewise.
	* sysdeps/s390/bits/byteswap.h: Likewise.
	* sysdeps/x86_64/bits/byteswap.h: Likewise.
	* string/Makefile (tests): Add tst-endian.
	* string/tst-endian.c: New file.
Diffstat (limited to 'bits')
-rw-r--r--bits/byteswap.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/bits/byteswap.h b/bits/byteswap.h
index 949ed0bc9d..45cb9471e3 100644
--- a/bits/byteswap.h
+++ b/bits/byteswap.h
@@ -1,5 +1,5 @@
 /* Macros to swap the order of bytes in integer values.
-   Copyright (C) 1997,1998,2000,2001,2002,2005 Free Software Foundation, Inc.
+   Copyright (C) 1997,1998,2000-2002,2005,2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -17,7 +17,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#if !defined _BYTESWAP_H && !defined _NETINET_IN_H
+#if !defined _BYTESWAP_H && !defined _NETINET_IN_H && !defined _ENDIAN_H
 # error "Never use <bits/byteswap.h> directly; include <byteswap.h> instead."
 #endif