summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-02-19 10:55:46 +0000
committerCaolán McNamara <caolanm@redhat.com>2016-02-19 10:58:41 +0000
commit2f3d85182ff9f2f1174a47b6139f358d232ee5e3 (patch)
treeafa330c60e18b9939cc32cd7030eff7bbeaf25cc /vcl/inc
parentcb3a1b5958ea067af867e4dd59636868dfdd2d5c (diff)
loplugin: checkconfigmacros
I suppose Change-Id: I2821665548077162c4a434876aee407127b312a4
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/unx/gtk/gtkframe.hxx2
-rw-r--r--vcl/inc/unx/gtk/gtksalmenu.hxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 280ded7736a1..10b0ecfe3143 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -224,7 +224,7 @@ class GtkSalFrame : public SalFrame
SalMenu* m_pSalMenu;
-#if defined(ENABLE_DBUS) && defined(ENABLE_GIO)
+#if defined(ENABLE_DBUS) && ENABLE_GIO
public:
void EnsureDbusMenuSynced();
private:
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index cc0193cfa66e..8df2c1dd52df 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -13,14 +13,14 @@
#include <config_vclplug.h>
#include <vector>
-#ifdef ENABLE_GIO
+#if ENABLE_GIO
#include <gio/gio.h>
#endif
#include <unx/salmenu.h>
#include <unx/gtk/gtkframe.hxx>
-#if defined(ENABLE_DBUS) && defined(ENABLE_GIO) && \
+#if defined(ENABLE_DBUS) && ENABLE_GIO && \
(GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 36)
# define ENABLE_GMENU_INTEGRATION
# include <unx/gtk/glomenu.h>