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>
This commit is contained in:
Peter Hutterer 2012-05-14 15:01:09 +10:00
parent 47e1d0ea43
commit 1bafc9f26b
7 changed files with 6 additions and 2 deletions

View File

@ -33,8 +33,6 @@
#ifndef PROTOCOL_COMMON_H #ifndef PROTOCOL_COMMON_H
#define PROTOCOL_COMMON_H #define PROTOCOL_COMMON_H
extern int BadDevice;
/* Check default values in a reply */ /* Check default values in a reply */
#define reply_check_defaults(rep, len, type) \ #define reply_check_defaults(rep, len, type) \
{ \ { \

View File

@ -37,6 +37,7 @@
#include "scrnintstr.h" #include "scrnintstr.h"
#include "xipassivegrab.h" #include "xipassivegrab.h"
#include "exevents.h" #include "exevents.h"
#include "exglobals.h"
#include "protocol-common.h" #include "protocol-common.h"

View File

@ -32,6 +32,7 @@
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include "inputstr.h" #include "inputstr.h"
#include "extinit.h" #include "extinit.h"
#include "exglobals.h"
#include "scrnintstr.h" #include "scrnintstr.h"
#include "xkbsrv.h" #include "xkbsrv.h"

View File

@ -37,6 +37,7 @@
#include "scrnintstr.h" #include "scrnintstr.h"
#include "xiquerypointer.h" #include "xiquerypointer.h"
#include "exevents.h" #include "exevents.h"
#include "exglobals.h"
#include "protocol-common.h" #include "protocol-common.h"

View File

@ -55,6 +55,7 @@
#include "windowstr.h" #include "windowstr.h"
#include "extinit.h" /* for XInputExtensionInit */ #include "extinit.h" /* for XInputExtensionInit */
#include "scrnintstr.h" #include "scrnintstr.h"
#include "exglobals.h"
#include "xiselectev.h" #include "xiselectev.h"
#include "protocol-common.h" #include "protocol-common.h"

View File

@ -44,6 +44,7 @@
#include "scrnintstr.h" #include "scrnintstr.h"
#include "xisetclientpointer.h" #include "xisetclientpointer.h"
#include "exevents.h" #include "exevents.h"
#include "exglobals.h"
#include "protocol-common.h" #include "protocol-common.h"

View File

@ -37,6 +37,7 @@
#include "scrnintstr.h" #include "scrnintstr.h"
#include "xiwarppointer.h" #include "xiwarppointer.h"
#include "exevents.h" #include "exevents.h"
#include "exglobals.h"
#include "protocol-common.h" #include "protocol-common.h"