diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-11-15 22:48:55 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-15 22:48:55 +0100 |
| commit | 6b6783b50cb36ea607a36e6497cf4a7d5f96d989 (patch) | |
| tree | 5db884877c265606b5d8ee3d8038d7324602145d /vcl/inc/unx/gtk/gtksalmenu.hxx | |
| parent | 4e9bdee0bbef65d2419f36e504292e3341a81004 (diff) | |
Fix GLIB_MAJOR/MINOR_VERSION checks
Change-Id: Iae16aad5adef480c941846dc9fb298b3a6dd9582
Diffstat (limited to 'vcl/inc/unx/gtk/gtksalmenu.hxx')
| -rw-r--r-- | vcl/inc/unx/gtk/gtksalmenu.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 7c16bb6e652d..5dad08596dd6 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -17,16 +17,16 @@ #include <unx/gtk/gtkframe.hxx> #if defined(ENABLE_DBUS) && defined(ENABLE_GIO) -# if GLIB_MAJOR_VERSION > 2 && GLIB_MINOR_VERSION >= 32 +# if GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 32 # define ENABLE_GMENU_INTEGRATION # endif # include <unx/gtk/glomenu.h> # include <unx/gtk/gloactiongroup.h> #else -# if GLIB_MAJOR_VERSION > 2 && GLIB_MINOR_VERSION >= 32 +# if !(GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 32) typedef void GMenuModel; # endif -# if GLIB_MAJOR_VERSION > 2 && GLIB_MINOR_VERSION >= 28 +# if !(GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 28) typedef void GActionGroup; # endif #endif |