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

Proposed by Stephen M. Webb on 2015-06-08
Status: Merged
Approved by: Christopher Townsend on 2015-06-08
Approved revision: 330
Merged at revision: 331
Proposed branch: lp:~bregma/geis/deb-751539
Merge into: lp:geis
Diff against target: 38 lines (+2/-4)
3 files modified
include/geis/geis.h (+1/-1)
libgeis/geis_backend_multiplexor.c (+0/-3)
testsuite/x11_mocks/x11_mocks.c (+1/-0)
To merge this branch: bzr merge lp:~bregma/geis/deb-751539
Reviewer Review Type Date Requested Status
Christopher Townsend 2015-06-08 Approve on 2015-06-08
PS Jenkins bot (community) continuous-integration Approve on 2015-06-08
Review via email: mp+261337@code.launchpad.net

Commit message

fix errors reported when build with clang

Description of the change

Fixes errors reported when build with clang.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Christopher Townsend (townsend) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/geis/geis.h'
2--- include/geis/geis.h 2013-11-25 02:22:33 +0000
3+++ include/geis/geis.h 2015-06-08 00:39:15 +0000
4@@ -858,7 +858,7 @@
5
6 typedef unsigned int GeisInputDeviceId;
7
8-#define GEIS_ALL_INPUT_DEVICES ((GeisInputDeviceId)0)
9+#define GEIS_ALL_INPUT_DEVICES ((GeisInputDeviceId*)0)
10
11 /**
12 * Prototype for input device callback functions.
13
14=== modified file 'libgeis/geis_backend_multiplexor.c'
15--- libgeis/geis_backend_multiplexor.c 2012-12-04 12:39:16 +0000
16+++ libgeis/geis_backend_multiplexor.c 2015-06-08 00:39:15 +0000
17@@ -31,9 +31,6 @@
18
19 typedef struct CallbackInfo *CallbackInfo;
20
21-static const GeisSize cbib_initial_size = 4;
22-static const GeisFloat cbib_expansion_factor = 1.5;
23-
24 struct CallbackInfo
25 {
26 int fd;
27
28=== modified file 'testsuite/x11_mocks/x11_mocks.c'
29--- testsuite/x11_mocks/x11_mocks.c 2012-09-05 14:38:58 +0000
30+++ testsuite/x11_mocks/x11_mocks.c 2015-06-08 00:39:15 +0000
31@@ -366,6 +366,7 @@
32 {
33 XMOCK_PRINT_FUNCTION;
34 (void)dpy;
35+ (void)values_mask;
36
37 XSyncAlarmNotifyEvent alarm_notify;
38 alarm_notify.type = xmock_xsync_event_base + XSyncAlarmNotify;

Subscribers

People subscribed via source and target branches