summaryrefslogtreecommitdiffstats
path: root/xc
diff options
context:
space:
mode:
authorPeter Åstrand <astrand@cendio.se>2005-02-23 13:21:09 +0000
committerPeter Åstrand <astrand@cendio.se>2005-02-23 13:21:09 +0000
commit200c31c64543ee61153608c9a82b8d1592484496 (patch)
tree17dd5fc7cca52798f057e54d72fab4ac761dbecf /xc
parent1402f8c08eebc85c88babc5394e151eb1a7a3787 (diff)
downloadtigervnc-200c31c64543ee61153608c9a82b8d1592484496.tar.gz
tigervnc-200c31c64543ee61153608c9a82b8d1592484496.zip
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
Diffstat (limited to 'xc')
-rw-r--r--xc/programs/Xserver/vnc/Xvnc/xvnc.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/xc/programs/Xserver/vnc/Xvnc/xvnc.cc b/xc/programs/Xserver/vnc/Xvnc/xvnc.cc
index a170e223..3ef17fd4 100644
--- a/xc/programs/Xserver/vnc/Xvnc/xvnc.cc
+++ b/xc/programs/Xserver/vnc/Xvnc/xvnc.cc
@@ -74,7 +74,9 @@ extern "C" {
#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>