diff options
| author | Adam Tkac <atkac@redhat.com> | 2009-01-07 16:08:43 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2009-01-07 16:08:43 +0000 |
| commit | 8c1e5b832223e426cfba9b47f9ccd81394ebb62b (patch) | |
| tree | 9bbd9df1701caf4fac03db5d02f544a794a9da1a /unix/xserver/hw/vnc/XserverDesktop.h | |
| parent | 43df913540af0385231ac2d6081a222a4e4b83fc (diff) | |
| download | tigervnc-8c1e5b832223e426cfba9b47f9ccd81394ebb62b.tar.gz tigervnc-8c1e5b832223e426cfba9b47f9ccd81394ebb62b.zip | |
[Development] Make Xvnc compilable against X.org 1.6 branch
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3522 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix/xserver/hw/vnc/XserverDesktop.h')
| -rw-r--r-- | unix/xserver/hw/vnc/XserverDesktop.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/unix/xserver/hw/vnc/XserverDesktop.h b/unix/xserver/hw/vnc/XserverDesktop.h index 5dbf7ffa..5137249e 100644 --- a/unix/xserver/hw/vnc/XserverDesktop.h +++ b/unix/xserver/hw/vnc/XserverDesktop.h @@ -26,6 +26,15 @@ #include <dix-config.h> #endif +#if XORG_VERSION_CURRENT < \ + ((1 * 10000000) + (5 * 100000) + (99 * 1000)) +/* Xorg 1.5 branch */ +#define XORG_15 +#else +/* Xorg 1.6 branch */ +#define XORG_16 +#endif + #include <rfb/SDesktop.h> #include <rfb/HTTPServer.h> #include <rfb/PixelBuffer.h> |