From fecc7eb1cf66db64728ee2d68cd9443df7e70879 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 15 Nov 2013 06:00:44 -0800 Subject: 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 Reviewed-by: Adam Jackson --- test/input.c | 4 ++-- test/xi2/protocol-common.c | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/input.c b/test/input.c index df20f8235..aaa7a69d3 100644 --- a/test/input.c +++ b/test/input.c @@ -1101,7 +1101,7 @@ xi_unregister_handlers(void) static void cmp_attr_fields(InputAttributes * attr1, InputAttributes * attr2) { - char **tags1, **tags2; + const char **tags1, **tags2; assert(attr1 && attr2); assert(attr1 != attr2); @@ -1182,7 +1182,7 @@ dix_input_attributes(void) { InputAttributes orig = { 0 }; InputAttributes *new; - char *tags[4] = { "tag1", "tag2", "tag2", NULL }; + const char *tags[4] = { "tag1", "tag2", "tag2", NULL }; new = DuplicateInputAttributes(NULL); assert(!new); diff --git a/test/xi2/protocol-common.c b/test/xi2/protocol-common.c index e2b0b8ba3..0947898f0 100644 --- a/test/xi2/protocol-common.c +++ b/test/xi2/protocol-common.c @@ -43,9 +43,6 @@ static ClientRec server_client; void *userdata; -extern int CorePointerProc(DeviceIntPtr pDev, int what); -extern int CoreKeyboardProc(DeviceIntPtr pDev, int what); - static void fake_init_sprite(DeviceIntPtr dev) { -- cgit v1.2.3