summaryrefslogtreecommitdiff
path: root/driver/xf86-input-keyboard/src/lnx_KbdMap.c
diff options
context:
space:
mode:
Diffstat (limited to 'driver/xf86-input-keyboard/src/lnx_KbdMap.c')
-rw-r--r--driver/xf86-input-keyboard/src/lnx_KbdMap.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/driver/xf86-input-keyboard/src/lnx_KbdMap.c b/driver/xf86-input-keyboard/src/lnx_KbdMap.c
index d5bec1c6f..21bed2eff 100644
--- a/driver/xf86-input-keyboard/src/lnx_KbdMap.c
+++ b/driver/xf86-input-keyboard/src/lnx_KbdMap.c
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-
/*
* Slightly modified xf86KbdLnx.c which is
*
@@ -10,6 +8,7 @@
#include "config.h"
#endif
+#include <xorg-server.h>
#include <X11/X.h>
#include <X11/Xmd.h>
#include "input.h"
@@ -523,12 +522,12 @@ readKernelMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap)
/*
* Find the Mapping for the special server functions
*/
- pKbd->specialMap = (TransMapPtr) xcalloc(NUM_CUSTOMKEYS, 1);
+ pKbd->specialMap = (TransMapPtr) calloc(NUM_CUSTOMKEYS, 1);
if (pKbd->specialMap != NULL) {
pKbd->specialMap->end = NUM_CUSTOMKEYS;
- pKbd->specialMap->map = (unsigned char*) xcalloc(NUM_CUSTOMKEYS, 1);
+ pKbd->specialMap->map = (unsigned char*) calloc(NUM_CUSTOMKEYS, 1);
if (pKbd->specialMap == NULL) {
- xfree(pKbd->specialMap);
+ free(pKbd->specialMap);
pKbd->specialMap = NULL;
}
}