drop obsolete #ifdef HAVE_CONFIG_H

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

saa/saa.c

@@ -28,10 +28,6 @@
  * memory management.
  */
 
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
 #include <stdlib.h>
 
 #include "saa_priv.h"

saa/saa.h

@@ -32,14 +32,9 @@
 #ifndef _SAA_H_
 #define _SAA_H_
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#else
 #include <xorg-server.h>
-#endif
+
 #include <xf86.h>
 #include <damage.h>
 #include <picturestr.h>

saa/saa_priv.h

@@ -30,14 +30,10 @@
 #ifndef _SAA_PRIV_H
 #define _SAA_PRIV_H
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#else
+
 #include <xorg-server.h>
-#endif
+
 #include "xf86.h"
 
 #include "saa.h"

src/bits2pixels.c

@@ -8,9 +8,7 @@ char rcsId_bits2pixels[] = "Id: bits2pixels.c,v 1.6 2001/01/26 23:32:15 yoel Exp
 #define FILECODE "F(814)"
 #endif
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 /*
  * bits2pixels.c --

src/vmware.c

@@ -7,9 +7,7 @@ char rcsId_vmware[] =
     "Id: vmware.c,v 1.11 2001/02/23 02:10:39 yoel Exp $";
 #endif
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 /*
  * TODO: support the vmware linux kernel fb driver (Option "UseFBDev").

src/vmware.h

@@ -6,10 +6,7 @@
 #ifndef VMWARE_H
 #define VMWARE_H
 
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #ifdef HAVE_XORG_SERVER_1_1_0
 #include <string.h>

src/vmware_bootstrap.c

@@ -25,9 +25,7 @@
  * Author: Unknown at vmware
  * Author: Thomas Hellstrom <thellstrom@vmware.com>
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "xf86.h"
 #include "compiler.h"

src/vmware_common.c

@@ -24,9 +24,7 @@
  *
  * Author: Unknown at vmware
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <xf86.h>
 #include "vmware_common.h"

src/vmwarectrl.c

@@ -31,11 +31,7 @@
  *      The implementation of the VMWARE_CTRL protocol extension that
  *      allows X clients to communicate with the driver.
  */
-
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "dixstruct.h"
 #include "extnsionst.h"

src/vmwarecurs.c

@@ -7,9 +7,7 @@ char rcsId_vmwarecurs[] =
     "Id: vmwarecurs.c,v 1.5 2001/01/30 23:33:02 bennett Exp $";
 #endif
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "vmware.h"
 #include "vmware_common.h"

src/vmwaremodes.c

@@ -31,9 +31,8 @@
  *      Provide additional modes for the driver.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+
 #include "xf86.h"
 #ifdef HAVE_XORG_SERVER_1_2_0
 #include <xf86Modes.h>

src/vmwarevideo.c

@@ -32,11 +32,7 @@
  *      See http://www.xfree86.org/current/DESIGN16.html
  *
  */
-
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "vmware.h"
 #include "vmware_common.h"

src/vmwarexinerama.c

@@ -30,11 +30,7 @@
  *
  *      The implementation of the Xinerama protocol extension.
  */
-
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <xorg-server.h>
 

vmwgfx/vmwgfx_crtc.c

@@ -28,9 +28,7 @@
  * Author: Jakob Bornecrantz <wallbraker@gmail.com>
  * Author: Thomas Hellstrom <thellstrom@vmware.com>
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <unistd.h>
 #include <string.h>

vmwgfx/vmwgfx_ctrl.c

@@ -31,9 +31,7 @@
  *      The implementation of the VMWARE_CTRL protocol extension that
  *      allows X clients to communicate with the driver.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <xorg-server.h>
 #include "dixstruct.h"

vmwgfx/vmwgfx_dri2.c

@@ -29,9 +29,7 @@
  * Author: Thomas Hellstrom <thellstrom@vmware.com>
  *
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "xorg-server.h"
 #include "xf86.h"

vmwgfx/vmwgfx_dri3.c

@@ -25,9 +25,7 @@
  * Author: Thomas Hellstrom <thellstrom@vmware.com>
  *
  */
-#ifdef _HAVE_CONFIG_H_
 #include "config.h"
-#endif
 
 #include <xorg-server.h>
 

vmwgfx/vmwgfx_driver.c

@@ -28,10 +28,7 @@
  * Author: Jakob Bornecrantz <wallbraker@gmail.com>
  * Author: Thomas Hellstrom <thellstrom@vmware.com>
  */
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <unistd.h>
 #include <fcntl.h>

vmwgfx/vmwgfx_drmi.c

@@ -25,10 +25,7 @@
  * Author: Jakob Bornecrantz <wallbraker@gmail.com>
  * Author: Thomas Hellstrom <thellstrom@vmware.com>
  */
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <stdint.h>
 #include <errno.h>

vmwgfx/vmwgfx_hosted.c

@@ -24,10 +24,7 @@
  *
  * Author: Thomas Hellstrom <thellstrom@vmware.com>
  */
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "vmwgfx_hosted.h"
 

vmwgfx/vmwgfx_layout.c

@@ -23,10 +23,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  **************************************************************************/
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #ifdef HAVE_LIBUDEV
 #include "vmwgfx_driver.h"

vmwgfx/vmwgfx_output.c

@@ -27,9 +27,7 @@
  * Author: Jakob Bornecrantz <wallbraker@gmail.com>
  *
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "xorg-server.h"
 #include <xf86drm.h>

vmwgfx/vmwgfx_overlay.c

@@ -33,10 +33,7 @@
  *      See http://www.xfree86.org/current/DESIGN16.html
  *
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
-
 
 #include "xorg-server.h"
 #include "xf86xv.h"

vmwgfx/vmwgfx_tex_video.c

@@ -25,9 +25,7 @@
  * Author: Thomas Hellstrom <thellstrom@vmware.com>
  * Author: Zack Rusin <zackr@vmware.com>
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "vmwgfx_driver.h"
 #include "vmwgfx_drmi.h"

vmwgfx/vmwgfx_xa_composite.c

@@ -28,10 +28,7 @@
  * The code in this file translates XRender PICT composite stuff
  * to fit the libxatracker API.
  */
-
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <pixman.h>
 #include <picturestr.h>

vmwgfx/vmwgfx_xa_surface.c

@@ -24,9 +24,7 @@
  *
  * Author: Thomas Hellstrom <thellstrom@vmware.com>
  */
-#ifdef _HAVE_CONFIG_H_
 #include "config.h"
-#endif
 
 #include <xorg-server.h>
 #include "vmwgfx_saa_priv.h"