[Xorg] build problem in dri in monolithic tree

[Matthieu Herrb]

cc -c -O2 -ansi -Wall -Wpointer-arith -Wundef   -fno-stack-protector 
-I../../../../programs/Xserver/include -I../../../../exports/include 
-I../../../../exports/include/X11 
-I../../../../include/extensions -I../../../../extras/Mesa/include 
         -I../../../../programs/Xserver/hw/xfree86/os-support 
-I../../../../programs/Xserver/hw/xfree86/common           -I../include 
-I../glx -I../../../../lib/GL/include 
-I../../../../extras/drm/shared 
-I../../../../programs/Xserver/mi -I../../../../include/fonts 
-I../../../.. -I../../../../exports/include   -DCSRG_BASED -DSHAPE 
-DXINPUT -DXKB -DLBX -DXAPPGROUP -DXCSECURITY -DTOGCUP  -DXF86BIGFONT 
-DDPMSExtension  -DPIXPRIV -DPANORAMIX  -DRENDER -DRANDR -DXFIXES 
-DDAMAGE -DGCCUSESGAS -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH 
-DXFreeXDGA -DXvExtension  -DXFree86Server -DXF86VIDMODE -DXvMCExtension 
-DSMART_SCHEDULE -DBUILDDEBUG -DXResExtension 
-DX_BYTE_ORDER=X_LITTLE_ENDIAN -DXORG_VERSION_CURRENT="(((6) * 10000000) 
+ ((7) * 100000) + ((0) * 1000) + 0)" -DNDEBUG   -DFUNCPROTO=15 
-DNARROWPROTO  -DXFree86Module -DGLXEXT -DXF86DRI -DGLX_DIRECT_RENDERING 
-DGLX_USE_DLOPEN -DGLX_USE_MESA   xf86dri.c
In file included from xf86dri.c:57:
dri.h:328: syntax error before `PciInfo'
*** Error code 1

(caused by the fact that dri.h references the pciVideoPtr type which is 
defined in xf68str.h, but the latter header isn't included).

The attached patch fixes it, but since DRI is not my domain, I'm not 
sure if it's the right fix.

Index: xf86dri.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/GL/dri/xf86dri.c,v
retrieving revision 1.3
diff -u -r1.3 xf86dri.c
--- xf86dri.c   16 Jun 2004 09:37:58 -0000      1.3
+++ xf86dri.c   25 Jul 2004 14:29:58 -0000
@@ -53,6 +53,7 @@
  #include "servermd.h"
  #define _XF86DRI_SERVER_
  #include "xf86dristr.h"
+#include "xf86str.h"
  #include "swaprep.h"
  #include "dri.h"
  #include "sarea.h"
Index: dri.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/GL/dri/dri.c,v
retrieving revision 1.3
diff -u -r1.3 dri.c
--- dri.c       16 Jun 2004 09:37:58 -0000      1.3
+++ dri.c       25 Jul 2004 14:29:59 -0000
@@ -56,6 +56,7 @@
  #include "servermd.h"
  #define _XF86DRI_SERVER_
  #include "xf86dristr.h"
+#include "xf86str.h"
  #include "swaprep.h"
  #include "dri.h"
  #include "sarea.h"

-- 
					Matthieu