diff options
| author | Keith Packard <keithp@keithp.com> | 2013-11-15 06:00:44 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-01-12 10:14:50 -0800 |
| commit | fecc7eb1cf66db64728ee2d68cd9443df7e70879 (patch) | |
| tree | 659d74fb9f18bcc8fc0a0774b71bfad3d8a050f2 /test | |
| parent | af04cf6968b16cc9efd17905471047e7de62058a (diff) | |
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>
Diffstat (limited to 'test')
| -rw-r--r-- | test/input.c | 4 | ||||
| -rw-r--r-- | test/xi2/protocol-common.c | 3 |
2 files changed, 2 insertions, 5 deletions
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) { |