[Libreoffice-commits] core.git: vcl/unx

[Stephan Bergmann]

 vcl/unx/gtk/app/gtkdata.cxx |    1 -
 vcl/unx/gtk/app/gtkinst.cxx |    1 -
 2 files changed, 2 deletions(-)

New commits:
commit 98ba9ca066fcf8f1e576eac4bbd5731b4f810c74
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 8 09:53:33 2013 +0200

    Revert "avoid warnings about deprecated decls. from glib2"
    
    This reverts commit a206bc22623caba30c0285fda0fe0da8879efea3.  While removing
    the GLIB_DISABLE_DEPRECATION_WARNINGS defines does not lead to problems at least
    with my current Fedora 18 environment (and, according to dtardon, "guessing by
    the date, it was on f16 or f17" where that fix was relevant), having the defines
    does cause -Werror=unused-macros at least in one RHEL 6 environment.
    
    So I'm reverting for now, in the hope that should any warnings re-appear, they
    can be addressed by applying the recent s/-I/$IFLAGS/ approach to GTK_CFLAGS in
    configure.ac.
    
    Change-Id: I5a3e4efabb88eb06304dd8b9eee6d8867fd77be5

diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 59eb593..af7043a 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -30,7 +30,6 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #endif
-#define GLIB_DISABLE_DEPRECATION_WARNINGS
 #include <unx/gtk/gtkdata.hxx>
 #include <unx/gtk/gtkinst.hxx>
 #include <unx/gtk/gtkframe.hxx>
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 2172a9e..b8afc3b 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -21,7 +21,6 @@
 #include <stack>
 #include <string.h>
 #include <osl/module.h>
-#define GLIB_DISABLE_DEPRECATION_WARNINGS
 #include <unx/gtk/gtkdata.hxx>
 #include <unx/gtk/gtkinst.hxx>
 #include <unx/salobj.h>