aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11/XKBCvt.c
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/lib/X11/XKBCvt.c
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/lib/X11/XKBCvt.c')
-rw-r--r--nx-X11/lib/X11/XKBCvt.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/nx-X11/lib/X11/XKBCvt.c b/nx-X11/lib/X11/XKBCvt.c
index f4df3fcfc..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)
{
@@ -279,11 +275,7 @@ _XkbGetCharset(void)
else {
struct stat sbuf;
FILE *file;
-#ifndef __UNIXOS2__
char *cf = CHARSET_FILE;
-#else
- char *cf = __XOS2RedirRoot(CHARSET_FILE);
-#endif
#ifndef S_ISREG
# define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG)