diff options
author | Khem Raj <raj.khem@gmail.com> | 2014-08-28 18:43:54 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-01 18:03:05 +0100 |
commit | 4d2685130098bf4f7548ad339e0f88c114dd720a (patch) | |
tree | c6624270962c66098112ddbb6a1c5a308ec97225 /meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch | |
parent | 5e328bf30ea39e09745e70c32f61249a53a03c1c (diff) | |
download | poky-4d2685130098bf4f7548ad339e0f88c114dd720a.tar.gz |
xf86-input-synaptics/xf86-input-vmmouse: Fix build with glibc 2.20
Backport the upstream patches needed for them to work with glibc 2.20
(From OE-Core rev: 60f78480135aab55e538c9e4e0b6d387139f1404)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch')
-rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch new file mode 100644 index 0000000000..12fb9df2fd --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch | |||
@@ -0,0 +1,81 @@ | |||
1 | From 336f8633837abe4a1e5ba84b53ac8b9dac5d29a2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> | ||
3 | Date: Thu, 28 Nov 2013 11:59:53 -0800 | ||
4 | Subject: Always include config.h first | ||
5 | |||
6 | This fixes some build warnings about CSRG_BASED being redefined due to | ||
7 | incorrect header include ordering. | ||
8 | |||
9 | Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> | ||
10 | |||
11 | Upstream-Status: Backport | ||
12 | |||
13 | Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_client.c | ||
14 | =================================================================== | ||
15 | --- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_client.c 2014-08-28 18:33:16.168070587 -0700 | ||
16 | +++ xf86-input-vmmouse-13.0.0/shared/vmmouse_client.c 2014-08-28 18:33:16.152070587 -0700 | ||
17 | @@ -39,6 +39,10 @@ | ||
18 | #endif | ||
19 | |||
20 | |||
21 | +#ifdef HAVE_CONFIG_H | ||
22 | +#include "config.h" | ||
23 | +#endif | ||
24 | + | ||
25 | #include "vmmouse_client.h" | ||
26 | #include "vmmouse_proto.h" | ||
27 | |||
28 | Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.c | ||
29 | =================================================================== | ||
30 | --- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_proto.c 2014-08-28 18:33:16.168070587 -0700 | ||
31 | +++ xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.c 2014-08-28 18:33:16.156070587 -0700 | ||
32 | @@ -33,6 +33,10 @@ | ||
33 | */ | ||
34 | |||
35 | |||
36 | +#ifdef HAVE_CONFIG_H | ||
37 | +#include "config.h" | ||
38 | +#endif | ||
39 | + | ||
40 | #include "vmmouse_proto.h" | ||
41 | |||
42 | |||
43 | Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.h | ||
44 | =================================================================== | ||
45 | --- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_proto.h 2014-08-28 18:33:16.168070587 -0700 | ||
46 | +++ xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.h 2014-08-28 18:33:16.156070587 -0700 | ||
47 | @@ -36,11 +36,6 @@ | ||
48 | #ifndef _VMMOUSE_PROTO_H_ | ||
49 | #define _VMMOUSE_PROTO_H_ | ||
50 | |||
51 | - | ||
52 | -#ifdef HAVE_CONFIG_H | ||
53 | -#include "config.h" | ||
54 | -#endif | ||
55 | - | ||
56 | #include <stdint.h> | ||
57 | |||
58 | #ifdef HAVE_XORG_SERVER_1_1_0 | ||
59 | Index: xf86-input-vmmouse-13.0.0/tools/vmmouse_detect.c | ||
60 | =================================================================== | ||
61 | --- xf86-input-vmmouse-13.0.0.orig/tools/vmmouse_detect.c 2014-08-28 18:33:16.168070587 -0700 | ||
62 | +++ xf86-input-vmmouse-13.0.0/tools/vmmouse_detect.c 2014-08-28 18:33:16.160070587 -0700 | ||
63 | @@ -26,14 +26,14 @@ | ||
64 | */ | ||
65 | |||
66 | |||
67 | -#include <stdlib.h> | ||
68 | -#include <signal.h> | ||
69 | -#include "vmmouse_client.h" | ||
70 | - | ||
71 | #ifdef HAVE_CONFIG_H | ||
72 | #include "config.h" | ||
73 | #endif | ||
74 | |||
75 | +#include <stdlib.h> | ||
76 | +#include <signal.h> | ||
77 | +#include "vmmouse_client.h" | ||
78 | + | ||
79 | void | ||
80 | segvCB(int sig) | ||
81 | { | ||