summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cpukit/ChangeLog5
-rw-r--r--cpukit/libnetworking/machine/endian.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index cf5e3bfebb..62279bc4af 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-05 Joel Sherrill <joel@OARcorp.com>
+
+ * libnetworking/machine/endian.h: Protect BYTE_ORDER from double
+ definition.
+
2004-11-05 Ralf Corsepius <ralf_corsepiu@rtems.org>
* configure.ac: Remove RTEMS_USES_INTTYPES_H. Require inttypes.h.
diff --git a/cpukit/libnetworking/machine/endian.h b/cpukit/libnetworking/machine/endian.h
index 34187dc93e..6faa8f1a71 100644
--- a/cpukit/libnetworking/machine/endian.h
+++ b/cpukit/libnetworking/machine/endian.h
@@ -13,6 +13,7 @@
#define BIG_ENDIAN 4321
#define LITTLE_ENDIAN 1234
+#ifndef BYTE_ORDER
#if CPU_BIG_ENDIAN
# define BYTE_ORDER BIG_ENDIAN
#elif CPU_LITTLE_ENDIAN
@@ -20,6 +21,7 @@
#else
# error "Can't decide which end is which!"
#endif
+#endif
#if ( CPU_HAS_OWN_HOST_TO_NETWORK_ROUTINES == FALSE )