aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/X11/ParseCol.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-12 08:32:04 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-10-12 08:32:04 +0200
commit051d521f6e20761ba6831cecd91883da960fa931 (patch)
treeb28abba7818115d2fed80eb360a79a0f9183948e /nx-X11/lib/X11/ParseCol.c
parent6dce607bad8711dd06a5a7b69ad1930386b4123b (diff)
parentb8de7bf654929c823080b211aeac56cd213f5a32 (diff)
downloadnx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.gz
nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.bz2
nx-libs-051d521f6e20761ba6831cecd91883da960fa931.zip
Merge branch 'uli42-pr/upgrade_libX11' into 3.6.x
Attributes GH PR #214: https://github.com/ArcticaProject/nx-libs/pull/214 Fixes ArcticaProject/nx-libs#157.
Diffstat (limited to 'nx-X11/lib/X11/ParseCol.c')
-rw-r--r--nx-X11/lib/X11/ParseCol.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/nx-X11/lib/X11/ParseCol.c b/nx-X11/lib/X11/ParseCol.c
index 5b7ec9f43..e997b1b8c 100644
--- a/nx-X11/lib/X11/ParseCol.c
+++ b/nx-X11/lib/X11/ParseCol.c
@@ -83,6 +83,7 @@ XParseColor (
}
+#ifdef XCMS
/*
* Let's Attempt to use Xcms and i18n approach to Parse Color
*/
@@ -106,6 +107,7 @@ XParseColor (
break;
}
}
+#endif
/*
* Xcms and i18n methods failed, so lets pass it to the server