From 31bc44fda8663693b339ab6185cfc09bc3dcdd98 Mon Sep 17 00:00:00 2001
From: Peter Osterlund <petero2@telia.com>
Date: Sun, 6 Jun 2004 09:32:02 +0200
Subject: [PATCH] Fixed compiler warnings when using the xorg sdk include
 files.

---
 eventcomm.c | 2 +-
 synaptics.h | 8 ++++----
 synclient.c | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/eventcomm.c b/eventcomm.c
index 214565b..598bd86 100644
--- a/eventcomm.c
+++ b/eventcomm.c
@@ -49,7 +49,7 @@ EventDeviceOnHook(LocalDevicePtr local)
     int ret;
     SYSCALL(ret = ioctl(local->fd, EVIOCGRAB, (pointer)1));
     if (ret < 0) {
-	xf86Msg(X_WARNING, "%s can't grab event device\n",
+	xf86Msg(X_WARNING, "%s can't grab event device, errno=%d\n",
 		local->name, errno);
     }
 }
diff --git a/synaptics.h b/synaptics.h
index 67c74ca..5ac249a 100644
--- a/synaptics.h
+++ b/synaptics.h
@@ -19,10 +19,10 @@ typedef enum {
 } TapEvent;
 
 struct SynapticsHwInfo {
-    unsigned long int model_id;		    /* Model-ID */
-    unsigned long int capabilities;	    /* Capabilities */
-    unsigned long int ext_cap;		    /* Extended Capabilities */
-    unsigned long int identity;		    /* Identification */
+    unsigned int model_id;		    /* Model-ID */
+    unsigned int capabilities;		    /* Capabilities */
+    unsigned int ext_cap;		    /* Extended Capabilities */
+    unsigned int identity;		    /* Identification */
     Bool hasGuest;			    /* Has a guest mouse */
 };
 
diff --git a/synclient.c b/synclient.c
index 3eb4d8d..f485819 100644
--- a/synclient.c
+++ b/synclient.c
@@ -35,9 +35,9 @@ static void show_hw_info(SynapticsSHM* synshm)
 {
     printf("Hardware properties:\n");
     if (synshm->synhw.model_id) {
-	printf("    Model Id     = %08lx\n", synshm->synhw.model_id);
-	printf("    Capabilities = %08lx\n", synshm->synhw.capabilities);
-	printf("    Identity     = %08lx\n", synshm->synhw.identity);
+	printf("    Model Id     = %08x\n", synshm->synhw.model_id);
+	printf("    Capabilities = %08x\n", synshm->synhw.capabilities);
+	printf("    Identity     = %08x\n", synshm->synhw.identity);
     } else {
 	printf("    No touchpad found\n");
 	printf("    Do you use a newer kernel than 2.4?\n");