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

Bug #3626 : _X_EXPORT tags for video and input drivers.
Fix includes right throughout the Xserver tree:
2026-04-14 11:14:32 +00:00 · 2005-07-11 02:30:06 +00:00 · 2005-06-25 21:16:59 +00:00 · 2005-04-20 12:25:32 +00:00 · 2004-06-16 09:24:09 +00:00 · 2004-04-23 19:52:24 +00:00
4 changed files with 11 additions and 7 deletions
--- a/2
+++ b/2
@@ -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 $
--- a/man/v4l.man
+++ b/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__
--- a/src/v4l.c
+++ b/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*/
@@ -50,7 +54,7 @@ static XF86ModuleVersionInfo v4lVersRec =
        MODULEVENDORSTRING,
        MODINFOSTRING1,
        MODINFOSTRING2,
-        XF86_VERSION_CURRENT,
+        XORG_VERSION_CURRENT,
        0, 0, 1,
        ABI_CLASS_VIDEODRV,
        ABI_VIDEODRV_VERSION,
@@ -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)
--- a/src/videodev.h
+++ b/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 */
Author	SHA1	Message	Date
Adam Jackson	1f05cde42c	Prep for modular builds by adding guarded #include "config.h" everywhere.	2005-07-11 02:30:06 +00:00
Adam Jackson	1fa8d2f701	Bug #3626 : _X_EXPORT tags for video and input drivers.	2005-06-25 21:16:59 +00:00
Daniel Stone	7123df70e0	Fix includes right throughout the Xserver tree: 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.	2005-04-20 12:25:32 +00:00
Eric Anholt	b299863dd2	DRI XFree86-4_3_99_12-merge import	2004-06-16 09:24:09 +00:00
Egbert Eich	1f8ceb0991	Merging XORG-CURRENT into trunk	2004-04-23 19:52:24 +00:00
Egbert Eich	fb4a148b6e	Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004	2004-03-14 08:33:41 +00:00
Egbert Eich	abaaf69833	Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004	2004-03-03 12:12:28 +00:00
Egbert Eich	bd8c0455c2	readding XFree86's cvs IDs	2004-02-26 13:35:55 +00:00
Egbert Eich	9c34b95344	Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004	2004-02-26 09:23:28 +00:00
Egbert Eich	871d6d6aef	Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004	2004-01-29 08:08:41 +00:00
Kaleb Keithley	e8bf6a26c8	XFree86 4.3.99.902 (RC 2)	2003-12-19 20:55:19 +00:00
Kaleb Keithley	0fc7fdb71a	XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks	2003-11-25 19:28:43 +00:00
Kaleb Keithley	1c98a4f36f	XFree86 4.3.0.1	2003-11-14 16:48:55 +00:00