From 68afc5647982eea284e325a9d89677dc8ccb636c Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@redhat.com>
Date: Tue, 29 Jul 2008 12:40:32 +0000
Subject: [PATCH] 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
---
 unix/xserver/hw/vnc/XserverDesktop.h | 2 +-
 unix/xserver/hw/vnc/vncHooks.cc      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/unix/xserver/hw/vnc/XserverDesktop.h b/unix/xserver/hw/vnc/XserverDesktop.h
index 522a94c3..5dbf7ffa 100644
--- 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 e83d1e76..1ba10919 100644
--- 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"
-- 
2.39.5