diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-01 11:53:02 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-01 15:51:40 +0000 |
commit | bec2e54d546751e5a3b1ab60a141e56d9392a135 (patch) | |
tree | 8f73741da6c1f7d92fb6eb96ea0b6987fce45035 /meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch | |
parent | e28927de86f5206161f8519f787312978e5fb54a (diff) | |
download | poky-bec2e54d546751e5a3b1ab60a141e56d9392a135.tar.gz |
libx11-trim: Drop obsolete 1.3.4 version
(From OE-Core rev: 6cb72d5f008c6cbf4960d9dc260b82a056042b0f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.patch | 45 |
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 @@ | |||
1 | Because the size of "unsigned long" is different between 32-bit | ||
2 | and 64-bit, judge whether target is 32-bit or 64-bit and tell | ||
3 | "makekey". | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | Signed-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; | ||