Merge lp:~bregma/geis/deb-751539 into lp:geis

[Stephen M. Webb]

fix errors reported when build with clang

Fixes errors reported when build with clang.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:330
http://jenkins.qa.ubuntu.com/job/geis-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-wily-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-wily-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/geis-wily-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/geis-ci/17/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

+1

review: Approve

=== modified file 'include/geis/geis.h'
--- include/geis/geis.h	2013-11-25 02:22:33 +0000
+++ include/geis/geis.h	2015-06-08 00:39:15 +0000
@@ -858,7 +858,7 @@
 
 typedef unsigned int GeisInputDeviceId;
 
-#define GEIS_ALL_INPUT_DEVICES ((GeisInputDeviceId)0)
+#define GEIS_ALL_INPUT_DEVICES ((GeisInputDeviceId*)0)
 
 /**
  * Prototype for input device callback functions.
 
=== modified file 'libgeis/geis_backend_multiplexor.c'
--- libgeis/geis_backend_multiplexor.c	2012-12-04 12:39:16 +0000
+++ libgeis/geis_backend_multiplexor.c	2015-06-08 00:39:15 +0000
@@ -31,9 +31,6 @@
 
 typedef struct CallbackInfo *CallbackInfo;
 
-static const GeisSize  cbib_initial_size = 4;
-static const GeisFloat cbib_expansion_factor = 1.5;
-
 struct CallbackInfo
 {
   int                             fd;
 
=== modified file 'testsuite/x11_mocks/x11_mocks.c'
--- testsuite/x11_mocks/x11_mocks.c	2012-09-05 14:38:58 +0000
+++ testsuite/x11_mocks/x11_mocks.c	2015-06-08 00:39:15 +0000
@@ -366,6 +366,7 @@
 {
   XMOCK_PRINT_FUNCTION;
   (void)dpy;
+  (void)values_mask;
 
   XSyncAlarmNotifyEvent alarm_notify;
   alarm_notify.type = xmock_xsync_event_base + XSyncAlarmNotify;