2 files changed, 5 insertions, 15 deletions
diff --git a/src/mesa/drivers/dri/unichrome/server/via_dri.c b/src/mesa/drivers/dri/unichrome/server/via_dri.c
index b8c8ffc68ef..63c49757dad 100644
--- a/src/mesa/drivers/dri/unichrome/server/via_dri.c
+++ b/src/mesa/drivers/dri/unichrome/server/via_dri.c
@@ -22,19 +22,6 @@
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-#if 0
-#include "xf86.h"
-#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
-#include "xf86Priv.h"
-
-#include "xf86PciInfo.h"
-#include "xf86Pci.h"
-
-#define _XF86DRI_SERVER_
-#include "GL/glxtokens.h"
-
-#else
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -45,7 +32,8 @@
 #include "driver.h"
 #include "drm.h"
 #include "imports.h"
-#endif
+
+typedef int Bool; /* via_dri.h makes use of this */
 
 #include "dri_util.h"
 
diff --git a/src/mesa/drivers/dri/unichrome/via_dri.h b/src/mesa/drivers/dri/unichrome/via_dri.h
index 693d961d25b..188c685a767 100644
--- a/src/mesa/drivers/dri/unichrome/via_dri.h
+++ b/src/mesa/drivers/dri/unichrome/via_dri.h
@@ -13,6 +13,8 @@ typedef struct {
     drmSize size;
 } viaRegion, *viaRegionPtr;
 
+typedef int Bool;
+
 typedef struct {
     viaRegion regs, agp;
     int deviceID;
@@ -24,7 +26,7 @@ typedef struct {
     int priv2;
     int fbOffset;
     int fbSize;
-    char drixinerama;
+    Bool drixinerama;
     int backOffset;
     int depthOffset;
     int textureOffset;