summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2011-12-20 16:43:44 +0300
committerJames Cloos <cloos@jhcloos.com>2012-06-10 05:11:06 -0400
commita06fa7fc98b66652df8bbc4734b5010d43744373 (patch)
tree1d06c10762017c41d87facb42fb5de9b4b1154aa
parenta6651a8d812d224a9e74205bdefb7081f743af11 (diff)
downloadxorg-proto-x11proto-a06fa7fc98b66652df8bbc4734b5010d43744373.tar.gz
Xmd.h: Treat __ILP32__ targets as LONG32 ones
amd64-x32 ABI defines sizeof(long) == sizeof (void*) == 4 Noticed on build failure of libXmu: libXmu-1.1.0/work/libXmu-1.1.0/src/EditresCom.c: In function '_XEditresGetStringValues': libXmu-1.1.0/work/libXmu-1.1.0/src/EditresCom.c:2198:6: error: duplicate case value libXmu-1.1.0/work/libXmu-1.1.0/src/EditresCom.c:2194:6: error: previously used here More info about x32: https://sites.google.com/site/x32abi/ Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> Signed-off-by: James Cloos <cloos@jhcloos.com>
-rw-r--r--Xmd.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/Xmd.h b/Xmd.h
index f3868b3..96cc08f 100644
--- a/Xmd.h
+++ b/Xmd.h
@@ -64,7 +64,9 @@ SOFTWARE.
defined(__s390x__) || \
defined(__amd64__) || defined(amd64) || \
defined(__powerpc64__)
-# define LONG64 /* 32/64-bit architecture */
+# if !defined(__ILP32__) /* amd64-x32 is 32bit */
+# define LONG64 /* 32/64-bit architecture */
+# endif /* !__ILP32__ */
# endif
/*