aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/dmx/input
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-06-14 13:15:50 +0000
committermarha <marha@users.sourceforge.net>2010-06-14 13:15:50 +0000
commite2eb44705a8e4886d81b75c12e68aaebe9946439 (patch)
tree00639c4f594cdaf4cb08d30dfdb4d4a4e38bc16c /xorg-server/hw/dmx/input
parent2dc9ef67a51796a1e25bd31eb58663a8023ddd80 (diff)
parent0cf9b03f4990f61640dc35dfac250f929b57b4ed (diff)
downloadvcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.tar.gz
vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.tar.bz2
vcxsrv-e2eb44705a8e4886d81b75c12e68aaebe9946439.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/dmx/input')
-rw-r--r--xorg-server/hw/dmx/input/dmxinputinit.c4
-rw-r--r--xorg-server/hw/dmx/input/usb-keyboard.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/hw/dmx/input/dmxinputinit.c b/xorg-server/hw/dmx/input/dmxinputinit.c
index 2e062ef79..0ea3e0953 100644
--- a/xorg-server/hw/dmx/input/dmxinputinit.c
+++ b/xorg-server/hw/dmx/input/dmxinputinit.c
@@ -885,7 +885,7 @@ static void dmxInputScanForExtensions(DMXInputInfo *dmxInput, int doXI)
&& dmxL->deviceId < 0) {
dmxL->deviceId = devices[i].id;
dmxL->deviceName = (devices[i].name
- ? xstrdup(devices[i].name)
+ ? strdup(devices[i].name)
: NULL);
}
}
@@ -918,7 +918,7 @@ static void dmxInputScanForExtensions(DMXInputInfo *dmxInput, int doXI)
dmxLocal->sendsCore = FALSE;
dmxLocal->deviceId = devices[i].id;
dmxLocal->deviceName = (devices[i].name
- ? xstrdup(devices[i].name)
+ ? strdup(devices[i].name)
: NULL);
}
}
diff --git a/xorg-server/hw/dmx/input/usb-keyboard.c b/xorg-server/hw/dmx/input/usb-keyboard.c
index fcbea47f9..c2b49039f 100644
--- a/xorg-server/hw/dmx/input/usb-keyboard.c
+++ b/xorg-server/hw/dmx/input/usb-keyboard.c
@@ -439,6 +439,6 @@ void kbdUSBGetInfo(DevicePtr pDev, DMXLocalInitInfoPtr info)
kbdUSBGetMap(pDev, &info->keySyms, info->modMap);
info->focusClass = 1;
info->kbdFeedbackClass = 1;
- info->names.keycodes = xstrdup("powerpcps2");
+ info->names.keycodes = strdup("powerpcps2");
info->force = 1;
}