- include dix-config.h before any xorg header

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1.5-xserver@2483 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc
index a6c4f2f186bae4321b2f916d738c4a61320a7fdb..dfa74cbdaf4a13701cf37e34c095575aa96845b8 100644 (file)
--- a/unix/xserver/hw/vnc/XserverDesktop.cc
+++ b/unix/xserver/hw/vnc/XserverDesktop.cc
@@ -19,6 +19,10 @@
 // XserverDesktop.cxx
 //
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stdio.h>
 #include <strings.h>
 #include <unistd.h>

diff --git a/unix/xserver/hw/vnc/XserverDesktop.h b/unix/xserver/hw/vnc/XserverDesktop.h
index 880acc212c2dd7f5e0992cabf5aea852a9c1c2fd..522a94c331ac61bca7ad05f25804a0e2c4df2ab4 100644 (file)
--- a/unix/xserver/hw/vnc/XserverDesktop.h
+++ b/unix/xserver/hw/vnc/XserverDesktop.h
@@ -22,6 +22,10 @@
 #ifndef __XSERVERDESKTOP_H__
 #define __XSERVERDESKTOP_H__
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <rfb/SDesktop.h>
 #include <rfb/HTTPServer.h>
 #include <rfb/PixelBuffer.h>

diff --git a/unix/xserver/hw/vnc/vncExtInit.cc b/unix/xserver/hw/vnc/vncExtInit.cc
index 84d20c14176ae0a288b48f71ddb6d6c184b8ef82..97df658549f9f6e255203504c82bbefd12ec0deb 100644 (file)
--- a/unix/xserver/hw/vnc/vncExtInit.cc
+++ b/unix/xserver/hw/vnc/vncExtInit.cc
@@ -16,6 +16,10 @@
  * USA.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stdio.h>
 
 extern "C" {

diff --git a/unix/xserver/hw/vnc/vncExtInit.h b/unix/xserver/hw/vnc/vncExtInit.h
index 45453e1f44ddaae9048b441b22ff4cf236c3f165..606666bb1c6c023257d52f2812b8b5e79969862e 100644 (file)
--- a/unix/xserver/hw/vnc/vncExtInit.h
+++ b/unix/xserver/hw/vnc/vncExtInit.h
@@ -18,6 +18,10 @@
 #ifndef __VNCEXTINIT_H__
 #define __VNCEXTINIT_H__
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <rfb/Configuration.h>
 #include "XserverDesktop.h"
 

diff --git a/unix/xserver/hw/vnc/vncHooks.cc b/unix/xserver/hw/vnc/vncHooks.cc
index 0d4392fe4798021f3f4e600469f8e805b21da5cb..e83d1e76fe95cb270a4ffae6599b68bf80311526 100644 (file)
--- a/unix/xserver/hw/vnc/vncHooks.cc
+++ b/unix/xserver/hw/vnc/vncHooks.cc
@@ -16,6 +16,10 @@
  * USA.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stdio.h>
 #include "XserverDesktop.h"
 #include "vncHooks.h"

diff --git a/unix/xserver/hw/vnc/vncHooks.h b/unix/xserver/hw/vnc/vncHooks.h
index c556ef3aea0ddf7a62b0741d9cf8b93a9beaf32d..30b51dbd07f7440cc4d5997cb3336655ed1067b1 100644 (file)
--- a/unix/xserver/hw/vnc/vncHooks.h
+++ b/unix/xserver/hw/vnc/vncHooks.h
@@ -18,6 +18,10 @@
 #ifndef __VNCHOOKS_H__
 #define __VNCHOOKS_H__
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 extern "C" {
 #include <screenint.h>
   extern Bool vncHooksInit(ScreenPtr pScreen, XserverDesktop* desktop);

diff --git a/unix/xserver/hw/vnc/xf86vncModule.cc b/unix/xserver/hw/vnc/xf86vncModule.cc
index ef8ea50692dfd8d75403fc094f5706efe31ef22e..fff482fade16097fbc2fe10e0a1448ae5bb38800 100644 (file)
--- a/unix/xserver/hw/vnc/xf86vncModule.cc
+++ b/unix/xserver/hw/vnc/xf86vncModule.cc
@@ -18,6 +18,10 @@
 /*  This is the xf86 module code for the vnc extension.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <rfb/Configuration.h>
 #include <rfb/Logger_stdio.h>
 #include <rfb/LogWriter.h>

diff --git a/unix/xserver/hw/vnc/xvnc.cc b/unix/xserver/hw/vnc/xvnc.cc
index c95516a72451f44be0e9d416c5eff7e0ca5efe1a..c212ca6673a0a56305926b93ab9a42dc2778bc47 100644 (file)
--- a/unix/xserver/hw/vnc/xvnc.cc
+++ b/unix/xserver/hw/vnc/xvnc.cc
@@ -27,6 +27,10 @@ from the X Consortium.
 
 */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <rfb/Configuration.h>
 #include <rfb/Logger_stdio.h>
 #include <rfb/LogWriter.h>