[Bugfix] Use malloc/free instead of Xalloc/Xfree when built against X.Org 1.10 and...

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4223 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/unix/xserver/hw/vnc/Input.cc b/unix/xserver/hw/vnc/Input.cc
index 9eb70f8132643a46e36e586e3d9b8d85324e5d14..e23f3d37d593cbb3e936b778b6d7fb246052c6d0 100644 (file)
--- 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 067ce96b6de0c3181be440dee742411fd4784ed1..cc15d79f6dec540b77086fb58afd813d4666fcef 100644 (file)
--- 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" \