diff options
| author | Adam Tkac <atkac@redhat.com> | 2013-02-19 13:51:29 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2013-02-19 13:51:29 +0000 |
| commit | 193ad14d35489bfcbd6bf093b19d8d259005cb05 (patch) | |
| tree | 7a238275eb2f50fe2067da0ddc5068742d649723 /unix | |
| parent | bc8e37cd5c1338c8c1a4ed51a9c8eba2a3b6208b (diff) | |
| download | tigervnc-193ad14d35489bfcbd6bf093b19d8d259005cb05.tar.gz tigervnc-193ad14d35489bfcbd6bf093b19d8d259005cb05.zip | |
X.Org 1.14 support was incomplete
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5047 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/xserver/hw/vnc/xorg-version.h | 4 | ||||
| -rw-r--r-- | unix/xserver/hw/vnc/xvnc.cc | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/unix/xserver/hw/vnc/xorg-version.h b/unix/xserver/hw/vnc/xorg-version.h index c1f45d7d..de5e9cb9 100644 --- a/unix/xserver/hw/vnc/xorg-version.h +++ b/unix/xserver/hw/vnc/xorg-version.h @@ -42,8 +42,10 @@ #define XORG 112 #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (13 * 100000) + (99 * 1000)) #define XORG 113 +#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (14 * 100000) + (99 * 1000)) +#define XORG 114 #else -#error "X.Org newer than 1.13 is not supported" +#error "X.Org newer than 1.14 is not supported" #endif #endif diff --git a/unix/xserver/hw/vnc/xvnc.cc b/unix/xserver/hw/vnc/xvnc.cc index 3b848b2b..9bd8171c 100644 --- a/unix/xserver/hw/vnc/xvnc.cc +++ b/unix/xserver/hw/vnc/xvnc.cc @@ -54,7 +54,9 @@ extern "C" { #include "servermd.h" #include "fb.h" #include "mi.h" +#if XORG < 114 #include "mibstore.h" +#endif #include "colormapst.h" #include "gcstruct.h" #include "input.h" |