summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2017-05-22 09:55:41 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2017-05-22 13:44:20 +0100
commitb0e3a9cbcfb01345eb8b938f35f90f5c20ef7bcc (patch)
tree04fbdca30eb543cc2c622795e44666240f3763b1
parent9466ce9bee6c89abed3014f399c34c0ea3563d31 (diff)
downloadatk-b0e3a9cbcfb01345eb8b938f35f90f5c20ef7bcc.tar.gz
build: Update deprecation warnings symbols
The old '*_DISABLE_DEPRECATED` pre-processor symbol class has been deprecated now that the G* stack has moved on to versioned symbols and versioned deprecation warnings. The appropriate way to disable compiler warnings when building is to use `*_DISABLE_DEPRECATION_WARNINGS`.
-rw-r--r--atk/Makefile.am4
-rw-r--r--atk/meson.build3
2 files changed, 4 insertions, 3 deletions
diff --git a/atk/Makefile.am b/atk/Makefile.am
index ad083fb..3f9db90 100644
--- a/atk/Makefile.am
+++ b/atk/Makefile.am
@@ -19,8 +19,8 @@ endif
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
- -DG_DISABLE_DEPRECATED \
- -DATK_DISABLE_DEPRECATED \
+ -DGLIB_DISABLE_DEPRECATION_WARNINGS \
+ -DATK_DISABLE_DEPRECATIO_WARNINGS \
-DATK_COMPILATION \
-DATK_LOCALEDIR="\"$(datadir)/locale\"" \
$(DEP_CFLAGS) \
diff --git a/atk/meson.build b/atk/meson.build
index 1654d6a..d92b6f0 100644
--- a/atk/meson.build
+++ b/atk/meson.build
@@ -101,7 +101,8 @@ atk_enum_h = atk_enums[1]
atk_cflags = [
'-DG_LOG_DOMAIN="Atk"',
'-DG_LOG_USE_STRUCTURED=1',
- '-DATK_DISABLE_DEPRECATED',
+ '-DGLIB_DISABLE_DEPRECATION_WARNINGS',
+ '-DATK_DISABLE_DEPRECATION_WARNINGS',
'-DATK_COMPILATION',
'-DATK_LOCALEDIR="@0@"'.format(join_paths(atk_datadir, 'locale')),
]