diff options
-rw-r--r-- | unix/xserver/hw/vnc/Input.cc | 4 | ||||
-rw-r--r-- | unix/xserver/hw/vnc/xvnc.cc | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/unix/xserver/hw/vnc/Input.cc b/unix/xserver/hw/vnc/Input.cc index 9eb70f81..e23f3d37 100644 --- a/unix/xserver/hw/vnc/Input.cc +++ b/unix/xserver/hw/vnc/Input.cc @@ -63,6 +63,10 @@ extern _X_EXPORT DevPrivateKey CoreDevicePrivateKey; #undef class } +#if XORG >= 110 +#define Xfree free +#endif + using namespace rdr; using namespace rfb; diff --git a/unix/xserver/hw/vnc/xvnc.cc b/unix/xserver/hw/vnc/xvnc.cc index 067ce96b..cc15d79f 100644 --- a/unix/xserver/hw/vnc/xvnc.cc +++ b/unix/xserver/hw/vnc/xvnc.cc @@ -91,6 +91,11 @@ extern "C" { #undef public } +#if XORG >= 110 +#define Xalloc malloc +#define Xfree free +#endif + #define XVNCVERSION "TigerVNC 1.0.90" #define XVNCCOPYRIGHT ("Copyright (C) 2002-2005 RealVNC Ltd.\n" \ "Copyright (C) 2000-2006 Constantin Kaplinsky\n" \ |