summaryrefslogtreecommitdiff
path: root/src/XListDev.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-14 16:48:49 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-14 16:48:49 +0000
commit3986f13c9319b4f64c7b2ec56391370735e7d51d (patch)
tree75c1586c56260fa99e560cb85302ed4daf8440a3 /src/XListDev.c
parent6b1f87ebe718c9c745d5f4b26343ee3cf34ff5cc (diff)
Diffstat (limited to 'src/XListDev.c')
-rw-r--r--src/XListDev.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/XListDev.c b/src/XListDev.c
index 714e0c4..71e63ce 100644
--- a/src/XListDev.c
+++ b/src/XListDev.c
@@ -45,6 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
+/* $XFree86: xc/lib/Xi/XListDev.c,v 3.5 2002/10/16 00:37:29 dawes Exp $ */
/***********************************************************************
*
@@ -55,11 +56,12 @@ SOFTWARE.
#define NEED_REPLIES
#define NEED_EVENTS
-#include "Xlibint.h"
-#include "XIproto.h"
-#include "XI.h"
-#include "XInput.h"
-#include "extutil.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/extutil.h>
+#include "XIint.h"
XDeviceInfo
*XListInputDevices(dpy, ndevices)
@@ -69,15 +71,15 @@ XDeviceInfo
int size;
xListInputDevicesReq *req;
xListInputDevicesReply rep;
- xDeviceInfo *list, *slist;
- XDeviceInfo *sclist;
+ xDeviceInfo *list, *slist = NULL;
+ XDeviceInfo *sclist = NULL;
XDeviceInfo *clist = NULL;
xAnyClassPtr any, sav_any;
XAnyClassPtr Any;
char *nptr, *Nptr;
register int i,j,k;
register long rlen;
- XExtDisplayInfo *info = (XExtDisplayInfo *) XInput_find_display (dpy);
+ XExtDisplayInfo *info = XInput_find_display (dpy);
LockDisplay (dpy);
if (_XiCheckExtInit(dpy, XInput_Initial_Release) == -1)