diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-02-14 08:43:02 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-14 09:51:34 +0000 |
| commit | 97f04c8e9c3e798b0f319a4e1067c90e45e3507c (patch) | |
| tree | 5f93d655fee4910c1aa50494b1d62160b51c3626 /vcl | |
| parent | Updated core (diff) | |
| download | core-97f04c8e9c3e798b0f319a4e1067c90e45e3507c.tar.gz core-97f04c8e9c3e798b0f319a4e1067c90e45e3507c.zip | |
make compilable on RHEL-6
Change-Id: I5d0e2c23af1972c84e999ad458ae47703d94e9e0
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 4 | ||||
| -rw-r--r-- | vcl/inc/vcl/tabpage.hxx | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index a33a5584eb7a..63d066aa8044 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -54,6 +54,10 @@ typedef XLIB_Window GdkNativeWindow; #define gdk_window_foreign_new_for_display(a,b) gdk_x11_window_foreign_new_for_display(a,b) #endif +#if !(GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 26) + typedef void GDBusConnection; +#endif + class GtkSalFrame : public SalFrame { static const int nMaxGraphics = 2; diff --git a/vcl/inc/vcl/tabpage.hxx b/vcl/inc/vcl/tabpage.hxx index 769003d0357e..04dafe360cab 100644 --- a/vcl/inc/vcl/tabpage.hxx +++ b/vcl/inc/vcl/tabpage.hxx @@ -40,7 +40,7 @@ private: public: TabPage( Window* pParent, WinBits nStyle = 0 ); - TabPage(Window *pParent, const rtl::OString& rID, const rtl::OUString& rUIXMLDescription); + TabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription); TabPage( Window* pParent, const ResId& rResId ); |