xi: More warning cleanup for input

Lots more const char stuff.

Remove duplicate defs of CoreKeyboardProc and CorePointerProc from
test/xi2/protocol-common.c

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Keith Packard
2013-11-15 06:00:44 -08:00
parent af04cf6968
commit fecc7eb1cf
8 changed files with 26 additions and 28 deletions

View File

@@ -221,12 +221,12 @@ typedef struct _InputOption InputOption;
typedef struct _XI2Mask XI2Mask;
typedef struct _InputAttributes {
char *product;
char *vendor;
char *device;
char *pnp_id;
char *usb_id;
char **tags; /* null-terminated */
const char *product;
const char *vendor;
const char *device;
const char *pnp_id;
const char *usb_id;
const char **tags; /* null-terminated */
uint32_t flags;
} InputAttributes;

View File

@@ -542,7 +542,7 @@ typedef struct _DeviceIntRec {
GrabInfoRec deviceGrab; /* grab on the device */
int type; /* MASTER_POINTER, MASTER_KEYBOARD, SLAVE */
Atom xinput_type;
char *name;
const char *name;
int id;
KeyClassPtr key;
ValuatorClassPtr valuator;