diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-05-14 15:01:09 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-05-16 10:59:39 +1000 |
| commit | 1bafc9f26bef0997c98b97efa888ed5e2a54f6f0 (patch) | |
| tree | e5f07abd00521f5cf6f4fd786714b0ab3efc882b /test/xi2 | |
| parent | 47e1d0ea43eb7a6caf774f375f11849d0d515e14 (diff) | |
test: fix redundant declaration of "BadDevice"
In file included from protocol-common.c:36:0:
protocol-common.h:36:12: warning: redundant redeclaration of ‘BadDevice’
[-Wredundant-decls]
In file included from protocol-common.c:30:0:
../../Xi/exglobals.h:41:12: note: previous declaration of ‘BadDevice’ was
here
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Diffstat (limited to 'test/xi2')
| -rw-r--r-- | test/xi2/protocol-common.h | 2 | ||||
| -rw-r--r-- | test/xi2/protocol-xipassivegrabdevice.c | 1 | ||||
| -rw-r--r-- | test/xi2/protocol-xiquerydevice.c | 1 | ||||
| -rw-r--r-- | test/xi2/protocol-xiquerypointer.c | 1 | ||||
| -rw-r--r-- | test/xi2/protocol-xiselectevents.c | 1 | ||||
| -rw-r--r-- | test/xi2/protocol-xisetclientpointer.c | 1 | ||||
| -rw-r--r-- | test/xi2/protocol-xiwarppointer.c | 1 |
7 files changed, 6 insertions, 2 deletions
diff --git a/test/xi2/protocol-common.h b/test/xi2/protocol-common.h index 1b1717599..f27f248c6 100644 --- a/test/xi2/protocol-common.h +++ b/test/xi2/protocol-common.h @@ -33,8 +33,6 @@ #ifndef PROTOCOL_COMMON_H #define PROTOCOL_COMMON_H -extern int BadDevice; - /* Check default values in a reply */ #define reply_check_defaults(rep, len, type) \ { \ diff --git a/test/xi2/protocol-xipassivegrabdevice.c b/test/xi2/protocol-xipassivegrabdevice.c index 1d8c46b29..84b386bf3 100644 --- a/test/xi2/protocol-xipassivegrabdevice.c +++ b/test/xi2/protocol-xipassivegrabdevice.c @@ -37,6 +37,7 @@ #include "scrnintstr.h" #include "xipassivegrab.h" #include "exevents.h" +#include "exglobals.h" #include "protocol-common.h" diff --git a/test/xi2/protocol-xiquerydevice.c b/test/xi2/protocol-xiquerydevice.c index e588f8dc2..b45358ec1 100644 --- a/test/xi2/protocol-xiquerydevice.c +++ b/test/xi2/protocol-xiquerydevice.c @@ -32,6 +32,7 @@ #include <X11/Xatom.h> #include "inputstr.h" #include "extinit.h" +#include "exglobals.h" #include "scrnintstr.h" #include "xkbsrv.h" diff --git a/test/xi2/protocol-xiquerypointer.c b/test/xi2/protocol-xiquerypointer.c index ff7ff5c02..fc66b6429 100644 --- a/test/xi2/protocol-xiquerypointer.c +++ b/test/xi2/protocol-xiquerypointer.c @@ -37,6 +37,7 @@ #include "scrnintstr.h" #include "xiquerypointer.h" #include "exevents.h" +#include "exglobals.h" #include "protocol-common.h" diff --git a/test/xi2/protocol-xiselectevents.c b/test/xi2/protocol-xiselectevents.c index 4daba8775..8f6b947d4 100644 --- a/test/xi2/protocol-xiselectevents.c +++ b/test/xi2/protocol-xiselectevents.c @@ -55,6 +55,7 @@ #include "windowstr.h" #include "extinit.h" /* for XInputExtensionInit */ #include "scrnintstr.h" +#include "exglobals.h" #include "xiselectev.h" #include "protocol-common.h" diff --git a/test/xi2/protocol-xisetclientpointer.c b/test/xi2/protocol-xisetclientpointer.c index 51db4ac69..90f1b94c3 100644 --- a/test/xi2/protocol-xisetclientpointer.c +++ b/test/xi2/protocol-xisetclientpointer.c @@ -44,6 +44,7 @@ #include "scrnintstr.h" #include "xisetclientpointer.h" #include "exevents.h" +#include "exglobals.h" #include "protocol-common.h" diff --git a/test/xi2/protocol-xiwarppointer.c b/test/xi2/protocol-xiwarppointer.c index c279ac413..4bea333c3 100644 --- a/test/xi2/protocol-xiwarppointer.c +++ b/test/xi2/protocol-xiwarppointer.c @@ -37,6 +37,7 @@ #include "scrnintstr.h" #include "xiwarppointer.h" #include "exevents.h" +#include "exglobals.h" #include "protocol-common.h" |