frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'whot/for-keith'

This commit is contained in:
Keith Packard 2010-11-15 09:06:33 +08:00
parent 3051dd5135 c8998af3eb
commit 38c46ccf79
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/common/xf86Config.c
View File

@ -1094,7 +1094,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout)
const char *pointerMsg = NULL, *keyboardMsg = NULL; const char *pointerMsg = NULL, *keyboardMsg = NULL;
InputInfoPtr *devs, /* iterator */ InputInfoPtr *devs, /* iterator */
indp; indp;
InputInfoRec Pointer, Keyboard; InputInfoRec Pointer = {}, Keyboard = {};
XF86ConfInputPtr confInput; XF86ConfInputPtr confInput;
XF86ConfInputRec defPtr, defKbd; XF86ConfInputRec defPtr, defKbd;
int count = 0; int count = 0;

1
hw/xwin/winmouse.c
View File

@ -39,6 +39,7 @@
#include "inputstr.h" #include "inputstr.h"
#include "exevents.h" /* for button/axes labels */ #include "exevents.h" /* for button/axes labels */
#include "xserver-properties.h" #include "xserver-properties.h"
#include "inpututils.h"
/* Peek the internal button mapping */ /* Peek the internal button mapping */
static CARD8 const *g_winMouseButtonMap = NULL; static CARD8 const *g_winMouseButtonMap = NULL;