diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2011-11-01 22:14:45 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2011-11-01 22:14:45 -0400 |
| commit | 9b0011be92c61436c5003332ca3a4ff17ce34717 (patch) | |
| tree | 9e1f220a58339921822106230b37087ef3fe1d20 /tests | |
| parent | 2a9932cf02e5a996e85fc190ebb35d4641f0bcea (diff) | |
| download | gtk+-9b0011be92c61436c5003332ca3a4ff17ce34717.tar.gz | |
Don't use *_DISABLE_DEPRECATED
Instead of undefining the DISABLE_DEPRECATED guards,
define the GDK_DISABLE_DEPRECATION_WARNING macro where needed.
Also replace INCLUDES by AM_CPPFLAGS to shut up automake.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 7 | ||||
| -rw-r--r-- | tests/testfontselection.c | 1 | ||||
| -rw-r--r-- | tests/testfontselectiondialog.c | 2 | ||||
| -rw-r--r-- | tests/testmerge.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 8b8494dc56..cc3b84bbcb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -3,12 +3,10 @@ include $(top_srcdir)/Makefile.decl SUBDIRS = css reftests a11y -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ -I$(top_srcdir)/gdk \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ $(GTK_DEBUG_FLAGS) \ $(GTK_DEP_CFLAGS) \ $(GDK_DEP_CFLAGS) @@ -129,6 +127,9 @@ noinst_PROGRAMS += testerrors endif if HAVE_CXX + +AM_CXXFLAGS = $(AM_CPPFLAGS) + noinst_PROGRAMS += autotestkeywords TESTS = autotestkeywords diff --git a/tests/testfontselection.c b/tests/testfontselection.c index a08e23441b..c02eacc593 100644 --- a/tests/testfontselection.c +++ b/tests/testfontselection.c @@ -19,7 +19,6 @@ #include "config.h" -#undef GTK_DISABLE_DEPRECATED #define GDK_DISABLE_DEPRECATION_WARNINGS #include <gtk/gtk.h> diff --git a/tests/testfontselectiondialog.c b/tests/testfontselectiondialog.c index 96f8652c73..9429c54944 100644 --- a/tests/testfontselectiondialog.c +++ b/tests/testfontselectiondialog.c @@ -19,7 +19,7 @@ #include "config.h" -#undef GTK_DISABLE_DEPRECATED +#define GDK_DISABLE_DEPRECATION_WARNINGS #include <gtk/gtk.h> diff --git a/tests/testmerge.c b/tests/testmerge.c index 0c14583720..d6e1e56638 100644 --- a/tests/testmerge.c +++ b/tests/testmerge.c @@ -25,7 +25,7 @@ #include <unistd.h> #endif -#undef GTK_DISABLE_DEPRECATED +#define GDK_DISABLE_DEPRECATION_WARNINGS #include <gtk/gtk.h> |