diff options
| author | Adam Tkac <atkac@redhat.com> | 2008-07-29 12:40:32 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2008-07-29 12:40:32 +0000 |
| commit | 68afc5647982eea284e325a9d89677dc8ccb636c (patch) | |
| tree | fde01b693340582b54bf9427fab05fd19afd07a1 /unix | |
| parent | 31e5aa3ddd282a4b0339d948b9461a1035ba891b (diff) | |
| download | tigervnc-68afc5647982eea284e325a9d89677dc8ccb636c.tar.gz tigervnc-68afc5647982eea284e325a9d89677dc8ccb636c.zip | |
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
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/xserver/hw/vnc/XserverDesktop.h | 2 | ||||
| -rw-r--r-- | unix/xserver/hw/vnc/vncHooks.cc | 2 |
2 files changed, 3 insertions, 1 deletions
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" |