From 98abac809a024ac3ed9dd0514ca96367f668c05d Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Thu, 11 Nov 2010 23:06:13 +0000 Subject: [PATCH 1/2] Fix compilation after input API change Fix compilation after commit 675f4a8525d29ebad783351e17be785b2f32b2e8 converts winmouse.c to the new ValuatorMask input API, but doesn't include the required header inpututil.h Signed-off-by: Jon TURNEY Signed-off-by: Peter Hutterer --- hw/xwin/winmouse.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/xwin/winmouse.c b/hw/xwin/winmouse.c index da1d5a9e7..ee93d8f02 100644 --- a/hw/xwin/winmouse.c +++ b/hw/xwin/winmouse.c @@ -39,6 +39,7 @@ #include "inputstr.h" #include "exevents.h" /* for button/axes labels */ #include "xserver-properties.h" +#include "inpututils.h" /* Peek the internal button mapping */ static CARD8 const *g_winMouseButtonMap = NULL; From c8998af3eba49a542625912d512087e4eaaf5ede Mon Sep 17 00:00:00 2001 From: Cyril Brulebois Date: Sat, 13 Nov 2010 02:05:16 +0100 Subject: [PATCH 2/2] xfree86: Initialize Pointer and Keyboard. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit That helps us get rid of: | CC xf86Config.lo | xf86Config.c: In function ‘T.174’: | xf86Config.c:1228: warning: ‘Pointer$module’ may be used uninitialized in this function | xf86Config.c:1097: note: ‘Pointer$module’ was declared here | xf86Config.c:1228: warning: ‘Pointer$drv’ may be used uninitialized in this function | xf86Config.c:1097: note: ‘Pointer$drv’ was declared here | xf86Config.c:1228: warning: ‘Pointer$type_name’ may be used uninitialized in this function | xf86Config.c:1097: note: ‘Pointer$type_name’ was declared here | xf86Config.c:1228: warning: ‘Pointer$private’ may be used uninitialized in this function | xf86Config.c:1097: note: ‘Pointer$private’ was declared here | xf86Config.c:1228: warning: ‘Pointer$dev’ may be used uninitialized in this function | xf86Config.c:1097: note: ‘Pointer$dev’ was declared here | xf86Config.c:1228: warning: ‘Pointer$fd’ may be used uninitialized in this function | xf86Config.c:1097: note: ‘Pointer$fd’ was declared here | xf86Config.c:1228: warning: ‘Pointer$set_device_valuators’ may be used uninitialized in this function | xf86Config.c:1097: note: ‘Pointer$set_device_valuators’ was declared here | xf86Config.c:1228: warning: ‘Pointer$switch_mode’ may be used uninitialized in this function | xf86Config.c:1097: note: ‘Pointer$switch_mode’ was declared here | xf86Config.c:1228: warning: ‘Pointer$control_proc’ may be used uninitialized in this function | xf86Config.c:1097: note: ‘Pointer$control_proc’ was declared here | xf86Config.c:1228: warning: ‘Pointer$read_input’ may be used uninitialized in this function | xf86Config.c:1097: note: ‘Pointer$read_input’ was declared here | xf86Config.c:1228: warning: ‘Pointer$device_control’ may be used uninitialized in this function | xf86Config.c:1097: note: ‘Pointer$device_control’ was declared here | xf86Config.c:1228: warning: ‘Pointer$flags’ may be used uninitialized in this function | xf86Config.c:1097: note: ‘Pointer$flags’ was declared here | xf86Config.c:1228: warning: ‘Pointer$next’ may be used uninitialized in this function | xf86Config.c:1097: note: ‘Pointer$next’ was declared here Signed-off-by: Cyril Brulebois Signed-off-by: Peter Hutterer --- hw/xfree86/common/xf86Config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index a9e827ef6..5800700db 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -1094,7 +1094,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) const char *pointerMsg = NULL, *keyboardMsg = NULL; InputInfoPtr *devs, /* iterator */ indp; - InputInfoRec Pointer, Keyboard; + InputInfoRec Pointer = {}, Keyboard = {}; XF86ConfInputPtr confInput; XF86ConfInputRec defPtr, defKbd; int count = 0;