From cf4dfd650dbc2bb65eae4eea2acfb4a4c5295548 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@nwnk.net>
Date: Mon, 11 Jul 2005 02:29:50 +0000
Subject: [PATCH] Prep for modular builds by adding guarded #include "config.h"
 everywhere.

---
 hw/xfree86/i2c/bt829.c          | 4 ++++
 hw/xfree86/i2c/bt829_module.c   | 3 +++
 hw/xfree86/i2c/fi1236.c         | 4 ++++
 hw/xfree86/i2c/fi1236_module.c  | 3 +++
 hw/xfree86/i2c/msp3430.c        | 4 ++++
 hw/xfree86/i2c/msp3430_module.c | 3 +++
 hw/xfree86/i2c/tda8425.c        | 4 ++++
 hw/xfree86/i2c/tda8425_module.c | 3 +++
 hw/xfree86/i2c/tda9850.c        | 4 ++++
 hw/xfree86/i2c/tda9850_module.c | 3 +++
 hw/xfree86/i2c/tda9885.c        | 4 ++++
 hw/xfree86/i2c/tda9885_module.c | 3 +++
 hw/xfree86/i2c/uda1380.c        | 7 +++++++
 hw/xfree86/i2c/uda1380_module.c | 3 +++
 14 files changed, 52 insertions(+)

diff --git a/hw/xfree86/i2c/bt829.c b/hw/xfree86/i2c/bt829.c
index 2cb5e53a07..b4d55873d9 100644
--- a/hw/xfree86/i2c/bt829.c
+++ b/hw/xfree86/i2c/bt829.c
@@ -1,5 +1,9 @@
 /* TODO: clean up/fix CC code */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86i2c.h"
 #include "bt829.h"
diff --git a/hw/xfree86/i2c/bt829_module.c b/hw/xfree86/i2c/bt829_module.c
index 998fdcb7e3..2340ef5719 100644
--- a/hw/xfree86/i2c/bt829_module.c
+++ b/hw/xfree86/i2c/bt829_module.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86Module.h"
 
diff --git a/hw/xfree86/i2c/fi1236.c b/hw/xfree86/i2c/fi1236.c
index 9d253d9c9d..a2d79df259 100644
--- a/hw/xfree86/i2c/fi1236.c
+++ b/hw/xfree86/i2c/fi1236.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86i2c.h"
 #include "fi1236.h"
diff --git a/hw/xfree86/i2c/fi1236_module.c b/hw/xfree86/i2c/fi1236_module.c
index 828f2b2d20..2c89177418 100644
--- a/hw/xfree86/i2c/fi1236_module.c
+++ b/hw/xfree86/i2c/fi1236_module.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86Module.h"
 
diff --git a/hw/xfree86/i2c/msp3430.c b/hw/xfree86/i2c/msp3430.c
index 699cfa4955..0f1e89fe00 100644
--- a/hw/xfree86/i2c/msp3430.c
+++ b/hw/xfree86/i2c/msp3430.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86i2c.h"
 #include "msp3430.h"
diff --git a/hw/xfree86/i2c/msp3430_module.c b/hw/xfree86/i2c/msp3430_module.c
index a036164a98..a5ca1aec96 100644
--- a/hw/xfree86/i2c/msp3430_module.c
+++ b/hw/xfree86/i2c/msp3430_module.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86Module.h"
 
diff --git a/hw/xfree86/i2c/tda8425.c b/hw/xfree86/i2c/tda8425.c
index 8ddf7267ef..700a01a896 100644
--- a/hw/xfree86/i2c/tda8425.c
+++ b/hw/xfree86/i2c/tda8425.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86i2c.h"
 #include "tda8425.h"
diff --git a/hw/xfree86/i2c/tda8425_module.c b/hw/xfree86/i2c/tda8425_module.c
index 7d35273ff1..d5858a3f05 100644
--- a/hw/xfree86/i2c/tda8425_module.c
+++ b/hw/xfree86/i2c/tda8425_module.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86Module.h"
 
diff --git a/hw/xfree86/i2c/tda9850.c b/hw/xfree86/i2c/tda9850.c
index 708dcccbba..d4578b2b3a 100644
--- a/hw/xfree86/i2c/tda9850.c
+++ b/hw/xfree86/i2c/tda9850.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86i2c.h"
 #include "tda9850.h"
diff --git a/hw/xfree86/i2c/tda9850_module.c b/hw/xfree86/i2c/tda9850_module.c
index b609c6a329..ea60d600a8 100644
--- a/hw/xfree86/i2c/tda9850_module.c
+++ b/hw/xfree86/i2c/tda9850_module.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86Module.h"
 
diff --git a/hw/xfree86/i2c/tda9885.c b/hw/xfree86/i2c/tda9885.c
index 8abdd2a2f8..b71fddf50d 100644
--- a/hw/xfree86/i2c/tda9885.c
+++ b/hw/xfree86/i2c/tda9885.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86i2c.h"
 #include "tda9885.h"
diff --git a/hw/xfree86/i2c/tda9885_module.c b/hw/xfree86/i2c/tda9885_module.c
index cafe35a3ee..331fbe719b 100644
--- a/hw/xfree86/i2c/tda9885_module.c
+++ b/hw/xfree86/i2c/tda9885_module.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86Module.h"
 
diff --git a/hw/xfree86/i2c/uda1380.c b/hw/xfree86/i2c/uda1380.c
index fb243f8b5c..8e36b9ae4e 100644
--- a/hw/xfree86/i2c/uda1380.c
+++ b/hw/xfree86/i2c/uda1380.c
@@ -5,12 +5,19 @@
  * License: GPL
  *
  * $Log$
+ * Revision 1.3  2005/07/11 02:29:50  ajax
+ * Prep for modular builds by adding guarded #include "config.h" everywhere.
+ *
  * Revision 1.2  2005/07/01 22:43:11  daniels
  * Change all misc.h and os.h references to <X11/foo.h>.
  *
  *
  ************************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "xf86.h"
 #include "xf86i2c.h"
 #include "uda1380.h"
diff --git a/hw/xfree86/i2c/uda1380_module.c b/hw/xfree86/i2c/uda1380_module.c
index 61aa40bb88..cfda721c74 100644
--- a/hw/xfree86/i2c/uda1380_module.c
+++ b/hw/xfree86/i2c/uda1380_module.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "xf86Module.h"