summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch')
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch45
1 files changed, 0 insertions, 45 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch
deleted file mode 100644
index e5eacf0515..0000000000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1Because the size of "unsigned long" is different between 32-bit
2and 64-bit, judge whether target is 32-bit or 64-bit and tell
3"makekey".
4
5Upstream-Status: Pending
6
7Signed-off-by: dbuitenh@windriver.com
8
9--- libX11-1.3.4.orig/src/util/makekeys.c 2010-01-15 09:11:36.000000000 +0800
10+++ libX11-1.3.4/src/util/makekeys.c 2011-05-24 19:04:25.454774908 +0800
11@@ -33,6 +33,7 @@
12 #include <X11/keysymdef.h>
13 #include <stdio.h>
14 #include <stdlib.h>
15+#include <stdint.h>
16
17 typedef unsigned long Signature;
18
19@@ -124,7 +125,12 @@
20 name = info[i].name;
21 sig = 0;
22 while ((c = *name++))
23- sig = (sig << 1) + c;
24+#ifdef USE32
25+ sig = (uint32_t)(sig << 1) + c;
26+#else
27+ sig = (uint64_t)(sig << 1) + c;
28+#endif
29+
30 first = j = sig % z;
31 for (k = 0; tab[j]; k++) {
32 j += first + 1;
33@@ -163,7 +169,11 @@
34 name = info[i].name;
35 sig = 0;
36 while ((c = *name++))
37- sig = (sig << 1) + c;
38+#ifdef USE32
39+ sig = (uint32_t)(sig << 1) + c;
40+#else
41+ sig = (uint64_t)(sig << 1) + c;
42+#endif
43 first = j = sig % z;
44 while (offsets[j]) {
45 j += first + 1;