From 1d64a7f636320786e5e5e76e8371d6d666bd0849 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri, 7 Sep 2007 09:48:34 -0700
Subject: [PATCH] Clear compiler & sparse warnings

void.c:41:9: warning: preprocessor token NEED_XF86_TYPES redefined
/usr/X11R7/include/xorg/xorg-server.h:69:9: this was the original definition
void.c:298:35: warning: Using plain integer as NULL pointer
---
 src/void.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/void.c b/src/void.c
index 6b09b8a..bf5848c 100644
--- a/src/void.c
+++ b/src/void.c
@@ -38,7 +38,7 @@
 
 #include <misc.h>
 #include <xf86.h>
-#define NEED_XF86_TYPES
+#define NEED_XF86_TYPES 1
 #if !defined(DGUX)
 #include <xisb.h>
 #endif
@@ -295,7 +295,7 @@ xf86VoidInit(InputDriverPtr	drv,
     pInfo->fd = -1;
     pInfo->dev = NULL;
     pInfo->private_flags = 0;
-    pInfo->always_core_feedback = 0;
+    pInfo->always_core_feedback = NULL;
     pInfo->conf_idev = dev;
 
     /* Collect the options, and process the common options. */