Merge remote branch 'whot/for-keith'
This commit is contained in:
commit
38c46ccf79
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue
Block a user