From 99bb7d9f8889bab6a2460756230a8abfac8c0291 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
Date: Thu, 4 Sep 2014 13:25:21 +0000
Subject: [PATCH] more merging

git-svn-id: https://zerberus.eonerc.rwth-aachen.de:8443/svn/s2ss/trunk@198 8ec27952-4edc-4aab-86aa-e87bb2611832
---
 clients/opal/models/send_receive/include/msg_format.h |  6 ++++--
 clients/opal/models/send_receive/src/msg.c            | 10 +++-------
 server/include/msg_format.h                           |  6 ++++--
 server/src/msg.c                                      | 11 ++++-------
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/clients/opal/models/send_receive/include/msg_format.h b/clients/opal/models/send_receive/include/msg_format.h
index 4ba4dc41c..40c21453b 100644
--- a/clients/opal/models/send_receive/include/msg_format.h
+++ b/clients/opal/models/send_receive/include/msg_format.h
@@ -13,8 +13,8 @@
 #ifdef __linux__
  #define _BSD_SOURCE    	1
  #include <endian.h>
-#elif !defined(BYTE_ORDER)
- #error "Please define BYTE_ORDER"
+#elif defined(__PPC__) /* Xilinx toolchain */
+  #include <lwip/arch.h>
 #endif
 
 #include "config.h"
@@ -37,6 +37,8 @@
  #define MSG_ENDIAN_HOST        MSG_ENDIAN_LITTLE
 #elif BYTE_ORDER == BIG_ENDIAN
  #define MSG_ENDIAN_HOST        MSG_ENDIAN_BIG
+#else
+ #error "Unknown byte order!"
 #endif
 
 /** The total length of a message */
diff --git a/clients/opal/models/send_receive/src/msg.c b/clients/opal/models/send_receive/src/msg.c
index f948076d1..19acdca14 100644
--- a/clients/opal/models/send_receive/src/msg.c
+++ b/clients/opal/models/send_receive/src/msg.c
@@ -6,8 +6,9 @@
 
 #ifdef __linux__
  #include <byteswap.h>
-#elif defined(__powerpc__)
+#elif defined(__PPC__) /* Xilinx toolchain */
  #include <xil_io.h>
+ #define bswap_32(x)	Xil_EndianSwap32(x)
 #endif
 
 #include "msg.h"
@@ -15,13 +16,8 @@
 void msg_swap(struct msg *m)
 {
 	int i;
-	for (i = 0; i < m->length; i++) {
-#ifdef __linux__
+	for (i = 0; i < m->length; i++)
 		m->data[i].i = bswap_32(m->data[i].i);
-#elif defined(__powerpc__)
-		m->data[i].i = Xil_EndianSwap32(m->data[i].i);
-#endif
-	}
 
 	m->endian ^= 1;
 }
diff --git a/server/include/msg_format.h b/server/include/msg_format.h
index 4ba4dc41c..40c21453b 100644
--- a/server/include/msg_format.h
+++ b/server/include/msg_format.h
@@ -13,8 +13,8 @@
 #ifdef __linux__
  #define _BSD_SOURCE    	1
  #include <endian.h>
-#elif !defined(BYTE_ORDER)
- #error "Please define BYTE_ORDER"
+#elif defined(__PPC__) /* Xilinx toolchain */
+  #include <lwip/arch.h>
 #endif
 
 #include "config.h"
@@ -37,6 +37,8 @@
  #define MSG_ENDIAN_HOST        MSG_ENDIAN_LITTLE
 #elif BYTE_ORDER == BIG_ENDIAN
  #define MSG_ENDIAN_HOST        MSG_ENDIAN_BIG
+#else
+ #error "Unknown byte order!"
 #endif
 
 /** The total length of a message */
diff --git a/server/src/msg.c b/server/src/msg.c
index 22cfa78fa..bd369ee47 100644
--- a/server/src/msg.c
+++ b/server/src/msg.c
@@ -10,8 +10,9 @@
 
 #ifdef __linux__
  #include <byteswap.h>
-#elif defined(__powerpc__)
+#elif defined(__PPC__) /* Xilinx toolchain */
  #include <xil_io.h>
+ #define bswap_32(x)	Xil_EndianSwap32(x)
 #endif
 
 #include "msg.h"
@@ -20,13 +21,9 @@
 
 void msg_swap(struct msg *m)
 {
-	for (int i = 0; i < m->length; i++) {
-#ifdef __linux__
+	int i;
+	for (i = 0; i < m->length; i++)
 		m->data[i].i = bswap_32(m->data[i].i);
-#elif defined(__powerpc__)
-		m->data[i].i = Xil_EndianSwap32(m->data[i].i);
-#endif
-	}
 
 	m->endian ^= 1;
 }