aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/extras
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2017-02-09 22:01:31 +0100
committerMihai Moldovan <ionic@ionic.de>2017-02-09 22:01:31 +0100
commit0a314adfa63669155299c77e479ed68c349643bd (patch)
tree6c5f9776e63ed48109714fd5c70e2cca37661c60 /nx-X11/extras
parent86a6a340f06e7a735b92ca2923d2ebc6183de546 (diff)
parent029bae127dabb92f6e50a3b07d51f4921986efb0 (diff)
downloadnx-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/extras')
-rw-r--r--nx-X11/extras/Mesa/include/GL/glxext.h2
-rw-r--r--nx-X11/extras/Mesa/src/mesa/main/imports.h1
-rw-r--r--nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c5
-rw-r--r--nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c5
-rw-r--r--nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c5
5 files changed, 1 insertions, 17 deletions
diff --git a/nx-X11/extras/Mesa/include/GL/glxext.h b/nx-X11/extras/Mesa/include/GL/glxext.h
index 589d1ef36..0f5321a6c 100644
--- a/nx-X11/extras/Mesa/include/GL/glxext.h
+++ b/nx-X11/extras/Mesa/include/GL/glxext.h
@@ -340,7 +340,7 @@ typedef long int int64_t;
typedef long long int int64_t;
#endif /* __arch64__ */
#endif /* __STDC__ */
-#elif defined(__UNIXOS2__) || defined(__SOL64__)
+#elif defined(__SOL64__)
typedef long int int32_t;
typedef long long int int64_t;
#elif defined( __VMS )
diff --git a/nx-X11/extras/Mesa/src/mesa/main/imports.h b/nx-X11/extras/Mesa/src/mesa/main/imports.h
index 7c7a90a74..fd9c362ee 100644
--- a/nx-X11/extras/Mesa/src/mesa/main/imports.h
+++ b/nx-X11/extras/Mesa/src/mesa/main/imports.h
@@ -202,7 +202,6 @@ typedef union { GLfloat f; GLint i; } fi_type;
defined(__s390x__) || defined(__powerpc__) || \
defined(__amd64__) || \
defined(ia64) || defined(__ia64__) || \
- defined(__hppa__) || defined(hpux) || \
defined(__mips) || defined(_MIPS_ARCH) || \
defined(__arm__) || \
defined(__sh__) || \
diff --git a/nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c b/nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c
index ae8108b88..da482a2dd 100644
--- a/nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c
+++ b/nx-X11/extras/Mesa/src/mesa/math/m_debug_clip.c
@@ -36,11 +36,6 @@
#include "m_debug.h"
#include "m_debug_util.h"
-#ifdef __UNIXOS2__
-/* The linker doesn't like empty files */
-static char dummy;
-#endif
-
#ifdef DEBUG /* This code only used for debugging */
static clip_func *clip_tab[2] = {
diff --git a/nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c b/nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c
index e40399855..4eac6f6dc 100644
--- a/nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c
+++ b/nx-X11/extras/Mesa/src/mesa/math/m_debug_norm.c
@@ -38,11 +38,6 @@
#include "m_debug_util.h"
-#ifdef __UNIXOS2__
-/* The linker doesn't like empty files */
-static char dummy;
-#endif
-
#ifdef DEBUG /* This code only used for debugging */
diff --git a/nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c b/nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c
index d8250f246..84e11fe34 100644
--- a/nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c
+++ b/nx-X11/extras/Mesa/src/mesa/math/m_debug_xform.c
@@ -37,11 +37,6 @@
#include "m_debug.h"
#include "m_debug_util.h"
-#ifdef __UNIXOS2__
-/* The linker doesn't like empty files */
-static char dummy;
-#endif
-
#ifdef DEBUG /* This code only used for debugging */