[Libreoffice-commits] core.git: extensions/source

[Stephan Bergmann]

 extensions/source/plugin/inc/plugin/unx/plugcon.hxx |    1 +
 extensions/source/plugin/unx/npwrap.cxx             |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ef1aa6876f144b0aedb2b988d1f9b6aa22f378c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue May 7 11:53:56 2013 +0200

    -Werror=unused-macros
    
    Change-Id: I9fd616930eb0b336ce89e97bc333f19d4cf449ae

diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index cc27cc2..a0528bf 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -95,6 +95,7 @@ extern "C" {
 #include <config_vclplug.h>
 
 #if ENABLE_GTK
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #else
diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx
index 3f449ac..97b3f3f 100644
--- a/extensions/source/plugin/unx/npwrap.cxx
+++ b/extensions/source/plugin/unx/npwrap.cxx
@@ -38,7 +38,6 @@
 #include <fcntl.h>
 #include <signal.h>
 
-#define GLIB_DISABLE_DEPRECATION_WARNINGS
 #include <plugin/unx/plugcon.hxx>
 
 #include <osl/file.h>