Prep for modular builds by adding guarded #include "config.h" everywhere.

change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
    <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.

README

@@ -34,4 +34,4 @@
  
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/README,v 1.1 1999/03/28 15:32:50 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/README,v 1.2 2001/05/07 21:59:07 tsi Exp $

man/v4l.man

@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.man,v 1.2 2001/01/27 18:20:55 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.man,v 1.3 2001/05/29 22:24:06 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH V4L __drivermansuffix__ __vendorversion__
@@ -13,9 +13,9 @@ v4l \- video4linux driver
 .fi
 .SH DESCRIPTION
 .B v4l 
-is an __xservername__ driver for video4linux cards.  It provides a Xvideo
+is an XFree86 driver for video4linux cards.  It provides a Xvideo
 extention port for video overlay.  Just add the driver to the module
-list within the module section of your __xconfigfile__ file if you want
+list within the module section of your XF86Config file if you want
 to use it.  There are no config options.
 .P
 Note that the the extmod module is also required for the Xvideo
@@ -30,10 +30,10 @@ overlay.
 bt848/bt878-based TV cards are the most popular hardware these
 days.
 .SH CONFIGURATION DETAILS
-Please refer to __xconfigfile__(__filemansuffix__) for general configuration
+Please refer to XF86Config(__filemansuffix__) for general configuration
 details.  This section only covers configuration details specific to this
 driver.
 .SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS
 Authors include: Gerd Knorr <kraxel@bytesex.org>

src/v4l.c

@@ -4,6 +4,10 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.33 2003/12/05 03:55:32 dawes Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "videodev.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -12,7 +16,7 @@
 #include "xf86PciInfo.h"
 #include "xf86fbman.h"
 #include "xf86xv.h"
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
 #include "regionstr.h"
 #include "dgaproc.h"
 #include "xf86str.h"
@@ -29,7 +33,7 @@ static void     V4LIdentify(int flags);
 static Bool     V4LProbe(DriverPtr drv, int flags);
 static const OptionInfoRec * V4LAvailableOptions(int chipid, int busid);
 
-DriverRec V4L = {
+_X_EXPORT DriverRec V4L = {
         40000,
         "v4l",
         V4LIdentify, /* Identify*/
@@ -58,7 +62,7 @@ static XF86ModuleVersionInfo v4lVersRec =
         {0,0,0,0}
 };
 
-XF86ModuleData v4lModuleData = { &v4lVersRec, v4lSetup, NULL };
+_X_EXPORT XF86ModuleData v4lModuleData = { &v4lVersRec, v4lSetup, NULL };
 
 static pointer
 v4lSetup(pointer module, pointer opts, int *errmaj, int *errmin)

src/videodev.h

@@ -9,7 +9,7 @@
  */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/videodev.h,v 1.7tsi Exp $ */
 
-#include "Xmd.h"
+#include <X11/Xmd.h>
 
 #define VID_TYPE_CAPTURE	1	/* Can capture */
 #define VID_TYPE_TUNER		2	/* Can tune */