From 93dc13c91a2634c59d2ff233fa8ba79a534205b0 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Wed, 29 Sep 2010 13:26:21 +0200
Subject: client: Include config.h from common.h

config.h should be availible everywhere, so move its inclusion
to the top of common.h.
---
 client/application.cpp   | 4 ----
 client/common.h          | 4 ++++
 client/mjpeg_decoder.cpp | 4 ----
 client/x11/main.cpp      | 1 -
 client/x11/platform.cpp  | 1 -
 5 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/client/application.cpp b/client/application.cpp
index 3bd3330e..12580679 100644
--- a/client/application.cpp
+++ b/client/application.cpp
@@ -15,10 +15,6 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef WIN32
-#include "config.h"
-#endif
-
 #include "common.h"
 #ifdef WIN32
 #include <io.h>
diff --git a/client/common.h b/client/common.h
index c0ce4424..e1c149c6 100644
--- a/client/common.h
+++ b/client/common.h
@@ -18,6 +18,10 @@
 #ifndef _H_COMMON
 #define _H_COMMON
 
+#ifndef WIN32
+#include "config.h"
+#endif
+
 #ifndef _WIN32_WCE
 #include <errno.h>
 #endif
diff --git a/client/mjpeg_decoder.cpp b/client/mjpeg_decoder.cpp
index 8a3aedea..2470fb1e 100644
--- a/client/mjpeg_decoder.cpp
+++ b/client/mjpeg_decoder.cpp
@@ -16,10 +16,6 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef WIN32
-#include "config.h"
-#endif
-
 #include "common.h"
 #include "debug.h"
 #include "utils.h"
diff --git a/client/x11/main.cpp b/client/x11/main.cpp
index 4f49c705..dfcc101b 100644
--- a/client/x11/main.cpp
+++ b/client/x11/main.cpp
@@ -17,7 +17,6 @@
 
 #include "common.h"
 #include "application.h"
-#include "config.h"
 
 static void cleanup()
 {
diff --git a/client/x11/platform.cpp b/client/x11/platform.cpp
index a9b4449d..a87dcfa9 100644
--- a/client/x11/platform.cpp
+++ b/client/x11/platform.cpp
@@ -40,7 +40,6 @@
 #include <set>
 #include <values.h>
 #include <signal.h>
-#include <config.h>
 #include <sys/shm.h>
 
 #include "platform.h"
-- 
cgit