[Spice-devel] [PATCH 6/8] client: Include config.h from common.h

[alexl at redhat.com]

From: Alexander Larsson <alexl at redhat.com>

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 3bd3330..1258067 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 c0ce442..e1c149c 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 8a3aede..2470fb1 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 4f49c70..dfcc101 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 a9b4449..a87dcfa 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"
-- 
1.7.0.1