vcl/inc/unx/gtk/gtksalmenu.hxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 6b6783b50cb36ea607a36e6497cf4a7d5f96d989
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 15 22:48:55 2012 +0100
Fix GLIB_MAJOR/MINOR_VERSION checks
Change-Id: Iae16aad5adef480c941846dc9fb298b3a6dd9582
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 7c16bb6..5dad085 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
