summaryrefslogtreecommitdiff
path: root/atk
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 09:55:41 +0100
commitf1c8bbad608d65b6ea4565c0529f8ddee2e2b8ee (patch)
treec7ffd640c24900dde9ebbcbecac95189ee87121d /atk
parent5e635d01afc91ec90f1f84d5d9520139491ceb68 (diff)
downloadatk-f1c8bbad608d65b6ea4565c0529f8ddee2e2b8ee.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`.
Diffstat (limited to 'atk')
-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 22de312..2f0ded6 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')),
]