diff options
| author | George Sapountzis <[email protected]> | 2006-12-06 06:40:18 +0200 |
|---|---|---|
| committer | George Sapountzis <[email protected]> | 2006-12-21 19:41:08 +0200 |
| commit | b766643e5c3c9ed174c59b54e520f94e3420e39a (patch) | |
| tree | f32c42201172ca2601a66213eb655676d72825fb /src/mesa/main/glheader.h | |
| parent | af0190bc6ece5ab71346ad436f5e2558d072ad56 (diff) | |
Drop mesa wrappers for XFree86.
Diffstat (limited to 'src/mesa/main/glheader.h')
| -rw-r--r-- | src/mesa/main/glheader.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h index e37499e4be7..5abea137d74 100644 --- 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,18 +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) && !defined(NO_LIBCWRAPPER) -#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 @@ -68,7 +65,6 @@ #if defined(__linux__) && defined(__i386__) #include <fpu_control.h> #endif -#endif #include <float.h> #include <stdarg.h> |