aboutsummaryrefslogtreecommitdiffstats
path: root/unix/xserver/hw
diff options
context:
space:
mode:
authorDRC <dcommander@users.sourceforge.net>2010-05-20 17:54:18 +0000
committerDRC <dcommander@users.sourceforge.net>2010-05-20 17:54:18 +0000
commit4b1eee84946359b888163e2a87cc33ba58db95c7 (patch)
tree376e034a10a61b9b5b3327801440a6db6ff6f621 /unix/xserver/hw
parent61cc2a02a68e915b3bf0c35d22085e0e133fc93a (diff)
downloadtigervnc-4b1eee84946359b888163e2a87cc33ba58db95c7.tar.gz
tigervnc-4b1eee84946359b888163e2a87cc33ba58db95c7.zip
XConvertCase() in xorg-xserver 1.5 is simply a macro that maps to XkbConvertCase(), so not only if this #ifdef unnecessary, but it breaks the Xorg 7.4 build.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4063 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix/xserver/hw')
-rw-r--r--unix/xserver/hw/vnc/Input.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/unix/xserver/hw/vnc/Input.cc b/unix/xserver/hw/vnc/Input.cc
index f1e48018..da885195 100644
--- a/unix/xserver/hw/vnc/Input.cc
+++ b/unix/xserver/hw/vnc/Input.cc
@@ -712,11 +712,7 @@ static KeySym KeyCodetoKeySym(KeySymsPtr keymap, int keycode, int col)
}
if ((per <= (col|1)) || (syms[col|1] == NoSymbol)) {
-#if XORG >= 18
XkbConvertCase
-#else
- XConvertCase
-#endif
(syms[col&~1], &lsym, &usym);
if (!(col & 1))
return lsym;