patch against latest x11-proto/xproto (quite invasive)

xproto-7.0.22-no-LONG64-on-x32.patch (text/plain), 1.09 KB, created by Sergei Trofimovich (RETIRED) on 2011-12-20 13:52:37 UTC

From bd407260c9fe737c08caf47f36f81c0c23fb99a2 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <[e-mail]>
Date: Tue, 20 Dec 2011 16:43:44 +0300
Subject: [PATCH] Xmd.h: amd64-x32 ABI defines sizeof(long) == sizeof (void*) == 4

Fixes 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

Signed-off-by: Sergei Trofimovich <[e-mail]>
---
 Xmd.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Xmd.h b/Xmd.h
index f3868b3..8e0d7a4 100644
--- a/Xmd.h
+++ b/Xmd.h
@@ -62,7 +62,8 @@ SOFTWARE.
      defined(__ia64__) || defined(ia64) || \
      defined(__sparc64__) || \
      defined(__s390x__) || \
-     defined(__amd64__) || defined(amd64) || \
+     (defined(__amd64__) && defined(__LP64__)) /* skip x32 */ || \
+     defined(amd64) || \
      defined(__powerpc64__)
 #  define LONG64				/* 32/64-bit architecture */
 # endif
-- 
1.7.3.4