Revision: 4223
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4223&view=rev
Author:   atkac
Date:     2010-12-08 16:19:51 +0000 (Wed, 08 Dec 2010)

Log Message:
-----------
[Bugfix] Use malloc/free instead of Xalloc/Xfree when built against X.Org 1.10 
and newer.

Modified Paths:
--------------
    trunk/unix/xserver/hw/vnc/Input.cc
    trunk/unix/xserver/hw/vnc/xvnc.cc

Modified: trunk/unix/xserver/hw/vnc/Input.cc
===================================================================
--- trunk/unix/xserver/hw/vnc/Input.cc  2010-12-08 16:10:47 UTC (rev 4222)
+++ trunk/unix/xserver/hw/vnc/Input.cc  2010-12-08 16:19:51 UTC (rev 4223)
@@ -63,6 +63,10 @@
 #undef class
 }
 
+#if XORG >= 110
+#define Xfree free
+#endif
+
 using namespace rdr;
 using namespace rfb;
 

Modified: trunk/unix/xserver/hw/vnc/xvnc.cc
===================================================================
--- trunk/unix/xserver/hw/vnc/xvnc.cc   2010-12-08 16:10:47 UTC (rev 4222)
+++ trunk/unix/xserver/hw/vnc/xvnc.cc   2010-12-08 16:19:51 UTC (rev 4223)
@@ -91,6 +91,11 @@
 #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" \


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
This SF Dev2Dev email is sponsored by:

WikiLeaks The End of the Free Internet
http://p.sf.net/sfu/therealnews-com
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits

Reply via email to