Fix compilation issues with gcc 3.4 (patch from George Wright - <gwright cendio se>)

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1.5-xserver@2631 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/unix/xserver/hw/vnc/XserverDesktop.h b/unix/xserver/hw/vnc/XserverDesktop.h
index 522a94c331ac61bca7ad05f25804a0e2c4df2ab4..5dbf7ffa57a49ab3f58f3cea431508243a95460c 100644 (file)
--- a/unix/xserver/hw/vnc/XserverDesktop.h
+++ b/unix/xserver/hw/vnc/XserverDesktop.h
@@ -34,7 +34,7 @@
 #include <rdr/SubstitutingInStream.h>
 
 extern "C" {
-#define class c_class;
+#define class c_class
 #include <scrnintstr.h>
 #include <os.h>
 #undef class

diff --git a/unix/xserver/hw/vnc/vncHooks.cc b/unix/xserver/hw/vnc/vncHooks.cc
index e83d1e76fe95cb270a4ffae6599b68bf80311526..1ba109193869e3893465daba6660b9c7e3091115 100644 (file)
--- a/unix/xserver/hw/vnc/vncHooks.cc
+++ b/unix/xserver/hw/vnc/vncHooks.cc
@@ -27,6 +27,7 @@
 extern "C" {
 #define class c_class
 #define private c_private
+#define public c_public
 #include "scrnintstr.h"
 #include "windowstr.h"
 #include "gcstruct.h"
@@ -47,6 +48,7 @@ extern "C" {
 
 #undef class
 #undef private
+#undef public
 }
 
 #include "RegionHelper.h"