summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-03-27 11:40:26 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-03-27 11:44:46 +0100
commitb2d2118f76b8bc95dc2aae76b7c3f7a697b0da24 (patch)
treeccb9fd62b48c82d106a4845896dbd14904c20ed1 /solenv
parentc1ea7a2fb43a8f51134fafba78b3acc68f10fcf4 (diff)
-Werror,-Wunused-macros
Change-Id: I3c43fcfe7216a833f1dbe298098b72de52f0f155
Diffstat (limited to 'solenv')
-rw-r--r--solenv/bin/concat-deps.c38
1 files changed, 18 insertions, 20 deletions
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index 5d44f1f8a437..765bacd8a7fe 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -14,26 +14,26 @@
#ifdef __APPLE__
#ifdef __x86_64__
-#define CORE_BIG_ENDIAN 0
-#define CORE_LITTLE_ENDIAN 1
+#undef CORE_BIG_ENDIAN
+#define CORE_LITTLE_ENDIAN
#define USE_MEMORY_ALIGNMENT 64 /* big value -> no alignment */
#else
-#define CORE_BIG_ENDIAN 1
-#define CORE_LITTLE_ENDIAN 0
+#define CORE_BIG_ENDIAN
+#undef CORE_LITTLE_ENDIAN
#define USE_MEMORY_ALIGNMENT 4
#endif
#endif
#ifdef _AIX
-#define CORE_BIG_ENDIAN 1
-#define CORE_LITTLE_ENDIAN 0
+#define CORE_BIG_ENDIAN
+#undef CORE_LITTLE_ENDIAN
#define USE_MEMORY_ALIGNMENT 4
#endif /* Def _AIX */
#ifdef _MSC_VER
#define __windows
-#define CORE_BIG_ENDIAN 0
-#define CORE_LITTLE_ENDIAN 1
+#undef CORE_BIG_ENDIAN
+#define CORE_LITTLE_ENDIAN
#define USE_MEMORY_ALIGNMENT 64 /* big value -> no alignment */
#endif /* Def _MSC_VER */
@@ -42,8 +42,8 @@
defined(__DragonFly__) || defined(__FreeBSD_kernel__)
#include <sys/param.h>
#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define CORE_BIG_ENDIAN 0
-#define CORE_LITTLE_ENDIAN 1
+#undef CORE_BIG_ENDIAN
+#define CORE_LITTLE_ENDIAN
#if defined(__x86_64) || defined(__i386)
#define USE_MEMORY_ALIGNMENT 64
#else
@@ -51,8 +51,8 @@
#endif
#else /* !(__BYTE_ORDER == __LITTLE_ENDIAN) */
#if __BYTE_ORDER == __BIG_ENDIAN
-#define CORE_BIG_ENDIAN 1
-#define CORE_LITTLE_ENDIAN 0
+#define CORE_BIG_ENDIAN
+#undef CORE_LITTLE_ENDIAN
#define USE_MEMORY_ALIGNMENT 4
#endif /* __BYTE_ORDER == __BIG_ENDIAN */
#endif /* !(__BYTE_ORDER == __LITTLE_ENDIAN) */
@@ -60,12 +60,12 @@
#ifdef __sun
#ifdef __sparc
-#define CORE_BIG_ENDIAN 1
-#define CORE_LITTLE_ENDIAN 0
+#define CORE_BIG_ENDIAN
+#undef CORE_LITTLE_ENDIAN
#define USE_MEMORY_ALIGNMENT 4
#else /* Ndef __sparc */
-#define CORE_BIG_ENDIAN 0
-#define CORE_LITTLE_ENDIAN 1
+#undef CORE_BIG_ENDIAN
+#define CORE_LITTLE_ENDIAN
#define USE_MEMORY_ALIGNMENT 4
#endif /* Ndef __sparc */
#endif /* Def __sun */
@@ -342,19 +342,17 @@ struct hash
#define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
-#if CORE_BIG_ENDIAN
+#if defined CORE_BIG_ENDIAN
#define MASK_C1 0xFFFFFF00
#define MASK_C2 0xFFFF0000
#define MASK_C3 0xFF000000
-#else
-#if CORE_LITTLE_ENDIAN
+#elif defined CORE_LITTLE_ENDIAN
#define MASK_C1 0xFFFFFF
#define MASK_C2 0xFFFF
#define MASK_C3 0xFF
#else
#error "Missing Endianness definition"
#endif
-#endif
#define mix(a,b,c) \