summaryrefslogtreecommitdiff
path: root/libc/sysdeps/ia64
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2008-05-15 12:10:03 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2008-05-15 12:10:03 +0000
commit12818040b14ab6c9c6985a6e70428b02648dfba9 (patch)
treeff76702d1d9310a8a633e8f2d15e22bc3e1afbd0 /libc/sysdeps/ia64
parent61cbd85d12af235a70ce428a0d83236c83c5ac93 (diff)
downloadeglibc2-12818040b14ab6c9c6985a6e70428b02648dfba9.tar.gz
Merge changes between r6154 and r6177 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@6178 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/ia64')
-rw-r--r--libc/sysdeps/ia64/bits/byteswap.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/sysdeps/ia64/bits/byteswap.h b/libc/sysdeps/ia64/bits/byteswap.h
index 6862aa0b6..d64914f36 100644
--- a/libc/sysdeps/ia64/bits/byteswap.h
+++ b/libc/sysdeps/ia64/bits/byteswap.h
@@ -1,5 +1,5 @@
/* Macros to swap the order of bytes in integer values.
- Copyright (C) 1997, 1998, 2000, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1997,1998,2000,2002,2003,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