X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Futil%2Fu_endian.h;h=6bbae3c444c322b7f16fbb6eef2c586f86aecb0c;hb=b7418270c34b0476345488ea9a9c7185a7327e15;hp=07f8d8cfc850a3ee6f1f1cbae1a612169b0959d8;hpb=f9f60da813e69aacf541d25a24622c896f15ba98;p=mesa.git

diff --git a/src/util/u_endian.h b/src/util/u_endian.h
index 07f8d8cfc85..6bbae3c444c 100644
--- a/src/util/u_endian.h
+++ b/src/util/u_endian.h
@@ -31,33 +31,33 @@
 #include <endian.h>
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
-# define PIPE_ARCH_LITTLE_ENDIAN 1
-# define PIPE_ARCH_BIG_ENDIAN 0
+# define UTIL_ARCH_LITTLE_ENDIAN 1
+# define UTIL_ARCH_BIG_ENDIAN 0
 #elif __BYTE_ORDER == __BIG_ENDIAN
-# define PIPE_ARCH_LITTLE_ENDIAN 0
-# define PIPE_ARCH_BIG_ENDIAN 1
+# define UTIL_ARCH_LITTLE_ENDIAN 0
+# define UTIL_ARCH_BIG_ENDIAN 1
 #endif
 
 #elif defined(__APPLE__)
 #include <machine/endian.h>
 
 #if __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN
-# define PIPE_ARCH_LITTLE_ENDIAN 1
-# define PIPE_ARCH_BIG_ENDIAN 0
+# define UTIL_ARCH_LITTLE_ENDIAN 1
+# define UTIL_ARCH_BIG_ENDIAN 0
 #elif __DARWIN_BYTE_ORDER == __DARWIN_BIG_ENDIAN
-# define PIPE_ARCH_LITTLE_ENDIAN 0
-# define PIPE_ARCH_BIG_ENDIAN 1
+# define UTIL_ARCH_LITTLE_ENDIAN 0
+# define UTIL_ARCH_BIG_ENDIAN 1
 #endif
 
 #elif defined(__sun)
 #include <sys/isa_defs.h>
 
 #if defined(_LITTLE_ENDIAN)
-# define PIPE_ARCH_LITTLE_ENDIAN 1
-# define PIPE_ARCH_BIG_ENDIAN 0
+# define UTIL_ARCH_LITTLE_ENDIAN 1
+# define UTIL_ARCH_BIG_ENDIAN 0
 #elif defined(_BIG_ENDIAN)
-# define PIPE_ARCH_LITTLE_ENDIAN 0
-# define PIPE_ARCH_BIG_ENDIAN 1
+# define UTIL_ARCH_LITTLE_ENDIAN 0
+# define UTIL_ARCH_BIG_ENDIAN 1
 #endif
 
 #elif defined(__OpenBSD__) || defined(__NetBSD__) || \
@@ -66,18 +66,24 @@
 #include <machine/endian.h>
 
 #if _BYTE_ORDER == _LITTLE_ENDIAN
-# define PIPE_ARCH_LITTLE_ENDIAN 1
-# define PIPE_ARCH_BIG_ENDIAN 0
+# define UTIL_ARCH_LITTLE_ENDIAN 1
+# define UTIL_ARCH_BIG_ENDIAN 0
 #elif _BYTE_ORDER == _BIG_ENDIAN
-# define PIPE_ARCH_LITTLE_ENDIAN 0
-# define PIPE_ARCH_BIG_ENDIAN 1
+# define UTIL_ARCH_LITTLE_ENDIAN 0
+# define UTIL_ARCH_BIG_ENDIAN 1
 #endif
 
-#elif defined(_WIN32)
+#elif defined(_WIN32) || defined(ANDROID)
 
-#define PIPE_ARCH_LITTLE_ENDIAN 1
-#define PIPE_ARCH_BIG_ENDIAN 0
+#define UTIL_ARCH_LITTLE_ENDIAN 1
+#define UTIL_ARCH_BIG_ENDIAN 0
 
 #endif
 
+#if !defined(UTIL_ARCH_LITTLE_ENDIAN) || !defined(UTIL_ARCH_BIG_ENDIAN)
+# error "UTIL_ARCH_LITTLE_ENDIAN and/or UTIL_ARCH_BIG_ENDIAN were unset."
+#elif UTIL_ARCH_LITTLE_ENDIAN == UTIL_ARCH_BIG_ENDIAN
+# error "UTIL_ARCH_LITTLE_ENDIAN and UTIL_ARCH_BIG_ENDIAN must not both be 1 or 0."
+#endif
+
 #endif