diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-12-04 21:14:24 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-12-04 21:14:24 +0100 |
commit | b38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9 (patch) | |
tree | ee0d60bb4a9c500f6072891a7802fd06be15ce8a /nx-X11/extras/Mesa/src/mesa/main/glheader.h | |
parent | 62f8e50e7a5ddc6952a951edc37ee53c2a828675 (diff) | |
parent | 508d2deae98846111299a3693033a507010e3c91 (diff) | |
download | nx-libs-b38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9.tar.gz nx-libs-b38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9.tar.bz2 nx-libs-b38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9.zip |
Merge branch 'sunweaver-pr/extmod-xfree86loader-cleanup' into 3.6.x
Attributes GH PR #251: https://github.com/ArcticaProject/nx-libs/pull/251
Diffstat (limited to 'nx-X11/extras/Mesa/src/mesa/main/glheader.h')
-rw-r--r-- | nx-X11/extras/Mesa/src/mesa/main/glheader.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nx-X11/extras/Mesa/src/mesa/main/glheader.h b/nx-X11/extras/Mesa/src/mesa/main/glheader.h index 90b3a81a4..31c10e3e2 100644 --- a/nx-X11/extras/Mesa/src/mesa/main/glheader.h +++ b/nx-X11/extras/Mesa/src/mesa/main/glheader.h @@ -47,11 +47,9 @@ #define GLHEADER_H -#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> @@ -65,7 +63,7 @@ #if defined(__linux__) && defined(__i386__) #include <fpu_control.h> #endif -#endif + #include <float.h> #include <stdarg.h> |