From 7499ef9ec5d89f176c8bd38bebbf343a702f1ba8 Mon Sep 17 00:00:00 2001
From: Matteo Cypriani <matteo.cypriani@univ-fcomte.fr>
Date: Thu, 7 Apr 2011 14:29:53 +0200
Subject: [PATCH] [Listener] Refactor endianess #defines

---
 owlps-listener/owlps-listener.h | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/owlps-listener/owlps-listener.h b/owlps-listener/owlps-listener.h
index 3f7ece2..fd8c1f9 100644
--- a/owlps-listener/owlps-listener.h
+++ b/owlps-listener/owlps-listener.h
@@ -24,23 +24,25 @@
  * version of glibc, or another libc (e.g. uClibc), we must define them
  * manually.
  */
-#ifndef le32toh
-# if __BYTE_ORDER == __LITTLE_ENDIAN
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+# ifndef le32toh
 #  define le32toh(x) (x)
-# else // __BYTE_ORDER == __LITTLE_ENDIAN
-#  include <byteswap.h>
-#  define le32toh(x) bswap_32(x)
-# endif // __BYTE_ORDER == __LITTLE_ENDIAN
-#endif // le32toh
-
-#ifndef le16toh
-# if __BYTE_ORDER == __LITTLE_ENDIAN
+# endif // le32toh
+# ifndef le16toh
 #  define le16toh(x) (x)
-# else // __BYTE_ORDER == __LITTLE_ENDIAN
-#  include <byteswap.h>
-#  define le16toh(x) bswap_16(x)
-# endif // __BYTE_ORDER == __LITTLE_ENDIAN
-#endif // le16toh
+# endif // le16toh
+#else // __BYTE_ORDER == __LITTLE_ENDIAN
+# if __BYTE_ORDER == __BIG_ENDIAN
+#  ifndef le32toh
+#   include <byteswap.h>
+#   define le32toh(x) bswap_32(x)
+#  endif // le32toh
+#  ifndef le16toh
+#   include <byteswap.h>
+#   define le16toh(x) bswap_16(x)
+#  endif // le16toh
+# endif // __BYTE_ORDER == __BIG_ENDIAN
+#endif // __BYTE_ORDER == __LITTLE_ENDIAN
 
 
 /* Arguments & program configuration */