commit 200c31c64543ee61153608c9a82b8d1592484496
author Peter Åstrand <astrand@cendio.se> Wed Feb 23 13:21:09 2005 +0000
committer Peter Åstrand <astrand@cendio.se> Wed Feb 23 13:21:09 2005 +0000
tree 17dd5fc7cca52798f057e54d72fab4ac761dbecf
parent 1402f8c08eebc85c88babc5394e151eb1a7a3787

Build fix: Temporarily change "new" to "New" when including micmap.h.


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

xc/programs/Xserver/vnc/Xvnc/xvnc.cc

diff --git a/xc/programs/Xserver/vnc/Xvnc/xvnc.cc b/xc/programs/Xserver/vnc/Xvnc/xvnc.cc
index a170e22..3ef17fd 100644
--- a/xc/programs/Xserver/vnc/Xvnc/xvnc.cc
+++ b/xc/programs/Xserver/vnc/Xvnc/xvnc.cc
@@ -74,7 +74,9 @@
 #include "gcstruct.h"
 #include "input.h"
 #include "mipointer.h"
+#define new New
 #include "micmap.h"
+#undef new
 #include <sys/types.h>
 #ifdef HAS_MMAP
 #include <sys/mman.h>