qxl: fix config.h usage

You have to include config.h at top of each C file, not inside a header file.

Signed-off-by: Dave Airlie <airlied@redhat.com>

13 files changed, 42 insertions, 2 deletions

diff --git a/src/qxl.h b/src/qxl.h
index f76d709..ed12680 100644
--- a/src/qxl.h
+++ b/src/qxl.h
@@ -23,8 +23,6 @@
 #ifndef QXL_H
 #define QXL_H
 
-#include "config.h"
-
 #include <stdint.h>
 
 #include <spice/qxl_dev.h>
diff --git a/src/qxl_cursor.c b/src/qxl_cursor.c
index c42e8fa..72c6c9f 100644
--- a/src/qxl_cursor.c
+++ b/src/qxl_cursor.c
@@ -23,6 +23,9 @@
 /** \file qxl_cursor.c
  * \author Søren Sandmann <sandmann@redhat.com>
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <string.h>
 #include "qxl.h"
diff --git a/src/qxl_driver.c b/src/qxl_driver.c
index ad82d50..5c826f3 100644
--- a/src/qxl_driver.c
+++ b/src/qxl_driver.c
@@ -28,6 +28,10 @@
  * in qemu.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <unistd.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/src/qxl_image.c b/src/qxl_image.c
index 8e5127d..dba40e3 100644
--- a/src/qxl_image.c
+++ b/src/qxl_image.c
@@ -24,6 +24,10 @@
  * \author Søren Sandmann <sandmann@redhat.com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
diff --git a/src/qxl_mem.c b/src/qxl_mem.c
index fed88ad..6e57a94 100644
--- a/src/qxl_mem.c
+++ b/src/qxl_mem.c
@@ -20,6 +20,10 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "qxl.h"
 #include "mspace.h"
 
diff --git a/src/qxl_option_helpers.c b/src/qxl_option_helpers.c
index 47603ce..8801b53 100644
--- a/src/qxl_option_helpers.c
+++ b/src/qxl_option_helpers.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 
 #include <xf86.h>
diff --git a/src/qxl_ring.c b/src/qxl_ring.c
index 7af6f63..fcbaaa7 100644
--- a/src/qxl_ring.c
+++ b/src/qxl_ring.c
@@ -23,6 +23,10 @@
 /** \file qxl_ring.c
  * \author Søren Sandmann <sandmann@redhat.com>
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/src/qxl_surface.c b/src/qxl_surface.c
index 7f68e5b..6761bf6 100644
--- a/src/qxl_surface.c
+++ b/src/qxl_surface.c
@@ -43,6 +43,10 @@
  * which puts the surface into the 'free' state.
  *
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "qxl.h"
 
 typedef struct evacuated_surface_t evacuated_surface_t;
diff --git a/src/spiceqxl_display.c b/src/spiceqxl_display.c
index 1e01268..ea61430 100644
--- a/src/spiceqxl_display.c
+++ b/src/spiceqxl_display.c
@@ -19,6 +19,9 @@
  * 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.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <spice.h>
 
diff --git a/src/spiceqxl_driver.c b/src/spiceqxl_driver.c
index 0b6392a..dea5190 100644
--- a/src/spiceqxl_driver.c
+++ b/src/spiceqxl_driver.c
@@ -26,6 +26,9 @@
  * most of the code is still in qxl_driver.c, but for clarity parts are moved
  * here, and only used / compiled if XSPICE is defined
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "qxl.h"
 #include "spiceqxl_driver.h"
diff --git a/src/spiceqxl_io_port.c b/src/spiceqxl_io_port.c
index bdb52bf..da99225 100644
--- a/src/spiceqxl_io_port.c
+++ b/src/spiceqxl_io_port.c
@@ -19,6 +19,9 @@
  * 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.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <pthread.h>
 #include <sched.h>
diff --git a/src/spiceqxl_main_loop.c b/src/spiceqxl_main_loop.c
index fb12bd2..1718861 100644
--- a/src/spiceqxl_main_loop.c
+++ b/src/spiceqxl_main_loop.c
@@ -19,6 +19,9 @@
  * 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.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <sys/time.h>
 
diff --git a/src/spiceqxl_spice_server.c b/src/spiceqxl_spice_server.c
index b7206cc..84fad06 100644
--- a/src/spiceqxl_spice_server.c
+++ b/src/spiceqxl_spice_server.c
@@ -25,6 +25,9 @@
  *
  * spice server helpers for spiceqxl.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "qxl.h"
 #include "qxl_option_helpers.h"