浏览代码

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
tags/v1.2.90
Adam Tkac 11 年前
父节点
当前提交
193ad14d35
共有 2 个文件被更改,包括 5 次插入1 次删除
  1. 3
    1
      unix/xserver/hw/vnc/xorg-version.h
  2. 2
    0
      unix/xserver/hw/vnc/xvnc.cc

+ 3
- 1
unix/xserver/hw/vnc/xorg-version.h 查看文件

#define XORG 112 #define XORG 112
#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (13 * 100000) + (99 * 1000)) #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (13 * 100000) + (99 * 1000))
#define XORG 113 #define XORG 113
#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (14 * 100000) + (99 * 1000))
#define XORG 114
#else #else
#error "X.Org newer than 1.13 is not supported"
#error "X.Org newer than 1.14 is not supported"
#endif #endif


#endif #endif

+ 2
- 0
unix/xserver/hw/vnc/xvnc.cc 查看文件

#include "servermd.h" #include "servermd.h"
#include "fb.h" #include "fb.h"
#include "mi.h" #include "mi.h"
#if XORG < 114
#include "mibstore.h" #include "mibstore.h"
#endif
#include "colormapst.h" #include "colormapst.h"
#include "gcstruct.h" #include "gcstruct.h"
#include "input.h" #include "input.h"

正在加载...
取消
保存