? depend
Index: via_dri.h
===================================================================
RCS file: /cvs/xorg/xc/extras/Mesa/src/mesa/drivers/dri/unichrome/via_dri.h,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 via_dri.h
--- via_dri.h	31 Jul 2005 16:47:16 -0000	1.1.1.2
+++ via_dri.h	28 Aug 2005 12:15:26 -0000
@@ -1,17 +1,41 @@
-#ifndef _VIA_DRI_
-#define _VIA_DRI_
-
-#include "xf86drm.h"
+/*
+ * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+/*
+ * Keep this file in perfect sync between the ddx and dri drivers.
+ *
+ */
+#ifndef _VIA_DRI_H_
+#define _VIA_DRI_H_ 1
 
 #define VIA_MAX_DRAWABLES 256
 
-#define VIA_VERSION_MAJOR		4
-#define VIA_VERSION_MINOR		1
+#define VIA_DRI_VERSION_MAJOR		4
+#define VIA_DRI_VERSION_MINOR		1
 
 typedef struct {
     drm_handle_t handle;
     drmSize size;
-    drmAddress map;
 } viaRegion, *viaRegionPtr;
 
 typedef struct {
@@ -25,7 +49,11 @@
     int priv2;
     int fbOffset;
     int fbSize;
+#ifdef XFree86Server
+    Bool drixinerama;
+#else
     char drixinerama;
+#endif
     int backOffset;
     int depthOffset;
     int textureOffset;
@@ -45,4 +73,4 @@
     int dummy;
 } VIADRIContextRec, *VIADRIContextPtr;
 
-#endif
+#endif /* _VIA_DRI_H_ */