diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-02-09 22:01:31 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-02-09 22:01:31 +0100 |
| commit | 0a314adfa63669155299c77e479ed68c349643bd (patch) | |
| tree | 6c5f9776e63ed48109714fd5c70e2cca37661c60 /nx-X11/programs/Xserver/mi | |
| parent | 86a6a340f06e7a735b92ca2923d2ebc6183de546 (diff) | |
| parent | 029bae127dabb92f6e50a3b07d51f4921986efb0 (diff) | |
| download | nx-libs-0a314adfa63669155299c77e479ed68c349643bd.tar.gz nx-libs-0a314adfa63669155299c77e479ed68c349643bd.tar.bz2 nx-libs-0a314adfa63669155299c77e479ed68c349643bd.zip | |
Merge branch 'sunweaver-pr/drop-support-for-ancient-platforms' into 3.6.x
Attributes GH PR #289: https://github.com/ArcticaProject/nx-libs/pull/289
Diffstat (limited to 'nx-X11/programs/Xserver/mi')
| -rw-r--r-- | nx-X11/programs/Xserver/mi/miarc.c | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/mi/micoord.h | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/mi/miinitext.c | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/mi/miarc.c b/nx-X11/programs/Xserver/mi/miarc.c index c812673eb..ee493bc2c 100644 --- a/nx-X11/programs/Xserver/mi/miarc.c +++ b/nx-X11/programs/Xserver/mi/miarc.c @@ -51,7 +51,7 @@ SOFTWARE. #include <dix-config.h> #endif -#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \ +#if defined(_XOPEN_SOURCE) \ || (defined(sun) && defined(__SVR4)) #include <math.h> #else diff --git a/nx-X11/programs/Xserver/mi/micoord.h b/nx-X11/programs/Xserver/mi/micoord.h index b3d725b73..3e45cfede 100644 --- a/nx-X11/programs/Xserver/mi/micoord.h +++ b/nx-X11/programs/Xserver/mi/micoord.h @@ -43,7 +43,7 @@ * forcing as to use div instead of shift. Let's be explicit. */ -#if defined(mips) || defined(sgi) || \ +#if defined(mips) || \ defined(sparc) || defined(__sparc64__) || \ defined(__alpha) || defined(__alpha__) || \ defined(__i386__) || defined(i386) || \ diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c index fc64937d7..6f6d67841 100644 --- a/nx-X11/programs/Xserver/mi/miinitext.c +++ b/nx-X11/programs/Xserver/mi/miinitext.c @@ -66,10 +66,6 @@ SOFTWARE. #include "extension.h" #include "micmap.h" -#if defined(QNX4) /* sleaze for Watcom on QNX4 ... */ -#undef GLXEXT -#endif - extern Bool noTestExtensions; #ifdef BIGREQS |