summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@freedesktop.org>2005-07-16 00:56:20 +0000
committerAdam Jackson <ajax@freedesktop.org>2005-07-16 00:56:20 +0000
commitc529f6bf701dcb50741a444f496ede1fa6a44fe0 (patch)
treeef6f2f199266edf247c15ae59834de0e17d12fa2
parent8d3aca655e0e7a7718c6f3a8cdbcbd0787cb85e3 (diff)
strip out vestigial #ifdef HAVE_CONFIG_H stanzas, they're confusing the
modular X build
-rw-r--r--src/mesa/drivers/x11/glxheader.h6
-rw-r--r--src/mesa/main/config.h5
-rw-r--r--src/mesa/main/glheader.h5
-rw-r--r--src/mesa/x86/common_x86_asm.h6
4 files changed, 1 insertions, 21 deletions
diff --git a/src/mesa/drivers/x11/glxheader.h b/src/mesa/drivers/x11/glxheader.h
index 42637f4c14..2533d50444 100644
--- a/src/mesa/drivers/x11/glxheader.h
+++ b/src/mesa/drivers/x11/glxheader.h
@@ -31,14 +31,8 @@
#include <GL/vms_x_fix.h>
#endif
-#ifdef HAVE_CONFIG_H
-#include "conf.h"
-#endif
-
-
#include "glheader.h"
-
#ifdef XFree86Server
# include "resource.h"
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 719c68e300..de2bae9cb0 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -31,11 +31,6 @@
#ifndef CONFIG_H
#define CONFIG_H
-#ifdef HAVE_CONFIG_H
-#include "conf.h"
-#endif
-
-
/**
* \name OpenGL implementation limits
*/
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index d1acd9ef81..ee34076fb7 100644
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -70,11 +70,6 @@
#include <stdarg.h>
-/* This is no longer uses since we dumped autoconf/automake! */
-#ifdef HAVE_CONFIG_H
-#include "conf.h"
-#endif
-
/* Get typedefs for uintptr_t and friends */
#if defined(_WIN32)
#include <BaseTsd.h>
diff --git a/src/mesa/x86/common_x86_asm.h b/src/mesa/x86/common_x86_asm.h
index a913bb1d09..9977298328 100644
--- a/src/mesa/x86/common_x86_asm.h
+++ b/src/mesa/x86/common_x86_asm.h
@@ -1,4 +1,4 @@
-/* $Id: common_x86_asm.h,v 1.11 2004/04/26 10:10:25 alanh Exp $ */
+/* $Id: common_x86_asm.h,v 1.12 2005/07/16 00:56:20 ajax Exp $ */
/*
* Mesa 3-D graphics library
@@ -43,10 +43,6 @@
*/
#include "common_x86_features.h"
-#ifdef HAVE_CONFIG_H
-#include "conf.h"
-#endif
-
#ifdef USE_X86_ASM
#include "x86.h"
#ifdef USE_3DNOW_ASM