nouveau: unbreak nv40

[mesa.git] / src / mesa / main / glheader.h

diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index 316a008ae301f4ef64650213ffaeead7258ff0c7..5abea137d747e26f168231718d0c8463b1ea7ea1 100644 (file)
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -5,8 +5,8 @@
  * This is the top-most include file of the Mesa sources.
  * It includes gl.h and all system headers which are needed.
  * Other Mesa source files should \e not directly include any system
- * headers.  This allows Mesa to be integrated into XFree86 and
- * allows system-dependent hacks/workarounds to be collected in one place.
+ * headers.  This allows system-dependent hacks/workarounds to be
+ * collected in one place.
  *
  * \note Actually, a lot of system-dependent stuff is now in imports.[ch].
  *
@@ -46,15 +46,15 @@
 #ifndef GLHEADER_H
 #define GLHEADER_H
 
+/* This allows Mesa to be integrated into XFree86 */
+#ifdef HAVE_DIX_CONFIG_H
+#include "dix-config.h"
+#endif
 
-#if defined(XFree86LOADER) && defined(IN_MODULE)
-#include "xf86_ansic.h"
-#else
 #include <assert.h>
 #include <ctype.h>
-/* If we can use Compaq's Fast Math Library on Alpha */
 #if defined(__alpha__) && defined(CCPML)
-#include <cpml.h>
+#include <cpml.h> /* use Compaq's Fast Math Library on Alpha */
 #else
 #include <math.h>
 #endif
@@ -65,7 +65,6 @@
 #if defined(__linux__) && defined(__i386__)
 #include <fpu_control.h>
 #endif
-#endif
 #include <float.h>
 #include <stdarg.h>
 
@@ -244,9 +243,12 @@
  * Don't define it if using a newer Windows compiler.
  */
 #if defined(__VMS)
-#define __FUNCTION__ "VMS$NL:"
-#elif !(defined(__GNUC__) && __GNUC__ >= 2) && !(defined(_MSC_VER) && _MSC_VER >= 1300)
-#define __FUNCTION__ "unknown"
+# define __FUNCTION__ "VMS$NL:"
+#elif __STDC_VERSION__ < 199901L
+# if ((!defined __GNUC__) || (__GNUC__ < 2)) && (!defined __xlC__) && \
+      (!defined(_MSC_VER) || _MSC_VER < 1300)
+#  define __FUNCTION__ "<unknown>"
+# endif
 #endif