aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-11-15 22:03:39 +0100
committerMihai Moldovan <ionic@ionic.de>2017-03-01 15:19:14 +0100
commit8c1a21b4568f50a1fbbe014ee744d7130754d2ed (patch)
treea6b8d62ef726871ff2af619a68bb4873536a76d9 /nx-X11/lib
parent5c3776d251ec0fb9cddf1d0ac641754582dbc4d7 (diff)
downloadnx-libs-8c1a21b4568f50a1fbbe014ee744d7130754d2ed.tar.gz
nx-libs-8c1a21b4568f50a1fbbe014ee744d7130754d2ed.tar.bz2
nx-libs-8c1a21b4568f50a1fbbe014ee744d7130754d2ed.zip
drop platform support: unifdef sgi.
Relates to ArcticaProject/nx-libs#275.
Diffstat (limited to 'nx-X11/lib')
-rw-r--r--nx-X11/lib/X11/SetLocale.c2
-rw-r--r--nx-X11/lib/X11/UIThrStubs.c2
-rw-r--r--nx-X11/lib/X11/XKB.c4
-rw-r--r--nx-X11/lib/X11/XKBCvt.c4
-rw-r--r--nx-X11/lib/X11/Xlibint.h3
5 files changed, 2 insertions, 13 deletions
diff --git a/nx-X11/lib/X11/SetLocale.c b/nx-X11/lib/X11/SetLocale.c
index 4f39f1fcf..3bbfd3ee6 100644
--- a/nx-X11/lib/X11/SetLocale.c
+++ b/nx-X11/lib/X11/SetLocale.c
@@ -102,7 +102,7 @@ _XlcMapOSLocaleName(
/* FIXME: correct indentation levels after ancient platform clean-up */
-#if defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(ultrix) || defined(WIN32) || defined(linux)
+#if defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(ultrix) || defined(WIN32) || defined(linux)
# ifdef ultrix
# define SKIPCOUNT 2
# define STARTCHAR '\001'
diff --git a/nx-X11/lib/X11/UIThrStubs.c b/nx-X11/lib/X11/UIThrStubs.c
index 8f4ea076b..0c913d41f 100644
--- a/nx-X11/lib/X11/UIThrStubs.c
+++ b/nx-X11/lib/X11/UIThrStubs.c
@@ -66,7 +66,7 @@ typedef cthread_t xthread_t;
#pragma weak condition_signal = _Xthr_zero_stub_
#pragma weak condition_broadcast = _Xthr_zero_stub_
#else /* !CTHREADS */
-#if defined(SVR4) && !defined(__sgi)
+#if defined(SVR4)
#include <thread.h>
typedef thread_t xthread_t;
#pragma weak thr_self = _Xthr_self_stub_
diff --git a/nx-X11/lib/X11/XKB.c b/nx-X11/lib/X11/XKB.c
index 7ecd39706..6df9c3ebc 100644
--- a/nx-X11/lib/X11/XKB.c
+++ b/nx-X11/lib/X11/XKB.c
@@ -373,11 +373,7 @@ XkbGetXlibControls(Display *dpy)
unsigned int
XkbXlibControlsImplemented(void)
{
-#ifdef __sgi
- return XkbLC_AllControls;
-#else
return XkbLC_AllControls & ~XkbLC_AllComposeControls;
-#endif
}
Bool
diff --git a/nx-X11/lib/X11/XKBCvt.c b/nx-X11/lib/X11/XKBCvt.c
index ded0a3e3a..c42c3af1c 100644
--- a/nx-X11/lib/X11/XKBCvt.c
+++ b/nx-X11/lib/X11/XKBCvt.c
@@ -50,10 +50,6 @@ from The Open Group.
#include <ctype.h>
#include <nx-X11/Xos.h>
-#ifdef __sgi_not_xconsortium
-#define XKB_EXTEND_LOOKUP_STRING
-#endif
-
static int
_XkbHandleSpecialSym(KeySym keysym, char *buffer, int nbytes, int *extra_rtrn)
{
diff --git a/nx-X11/lib/X11/Xlibint.h b/nx-X11/lib/X11/Xlibint.h
index c138d6360..b325182e3 100644
--- a/nx-X11/lib/X11/Xlibint.h
+++ b/nx-X11/lib/X11/Xlibint.h
@@ -248,9 +248,6 @@ typedef struct _XSQEvent
#endif
#include <nx-X11/Xproto.h>
-#ifdef __sgi
-#define _SGI_MP_SOURCE /* turn this on to get MP safe errno */
-#endif
#include <errno.h>
#define _XBCOPYFUNC _Xbcopy
#include <nx-X11/Xfuncs.h>