luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-11 23:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: Drop use of G_DISABLE_DEPRECATED from the build system

Browse Source 
It’s no longer used in any of the headers. See preceding commits.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
This commit is contained in:
Philip Withnall 2019-05-27 18:19:07 +01:00
parent 99b412bb19
commit 1741fc2c6e
7 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/reference/glib/compiling.xml
View File

@ -93,11 +93,10 @@ this range will trigger compiler warnings.
</para> </para>
<para> <para>
The older deprecation mechanism of hiding deprecated interfaces Since GLib 2.62, the older deprecation mechanism of hiding deprecated interfaces
entirely from the compiler by using the preprocessor symbol entirely from the compiler by using the preprocessor symbol
G_DISABLE_DEPRECATED is still used for deprecated macros, <literal>G_DISABLE_DEPRECATED</literal> has been removed. All deprecations
enumeration values, etc. To detect uses of these in your code, are now handled using the above mechanism.
use the commandline option <literal>-DG_DISABLE_DEPRECATED</literal>.
</para> </para>
<para> <para>

1
docs/reference/meson.build
View File

@ -26,7 +26,6 @@ foreach version : stable_2_series_versions
endforeach endforeach
gtkdoc_common_scan_args = [ gtkdoc_common_scan_args = [
'--deprecated-guards=G_DISABLE_DEPRECATED',
'--ignore-decorators=' + '|'.join(ignore_decorators), '--ignore-decorators=' + '|'.join(ignore_decorators),
] ]

2
gio/fam/meson.build
View File

@ -3,7 +3,7 @@ if not get_option('fam')
endif endif
fam_dep = cc.find_library('fam') fam_dep = cc.find_library('fam')
fam_c_args = ['-DG_DISABLE_DEPRECATED'] + gio_c_args fam_c_args = gio_c_args
if cc.has_function('FAMNoExists', dependencies : fam_dep) if cc.has_function('FAMNoExists', dependencies : fam_dep)
fam_c_args += '-DHAVE_FAM_NO_EXISTS=1' fam_c_args += '-DHAVE_FAM_NO_EXISTS=1'
endif endif

2
gio/inotify/meson.build
View File

@ -12,4 +12,4 @@ inotify_lib = static_library('inotify',
include_directories : [configinc, glibinc, gmoduleinc], include_directories : [configinc, glibinc, gmoduleinc],
dependencies : [gioenumtypes_dep, libglib_dep, libgobject_dep], dependencies : [gioenumtypes_dep, libglib_dep, libgobject_dep],
pic : true, pic : true,
c_args : [ '-DG_DISABLE_DEPRECATED' ] + gio_c_args) c_args : gio_c_args)

2
gio/kqueue/meson.build
View File

@ -10,4 +10,4 @@ kqueue_lib = static_library('kqueue',
include_directories : [configinc, glibinc, gmoduleinc], include_directories : [configinc, glibinc, gmoduleinc],
dependencies : [gioenumtypes_dep], dependencies : [gioenumtypes_dep],
pic : true, pic : true,
c_args : [ '-DG_DISABLE_DEPRECATED' ] + gio_c_args) c_args : gio_c_args)

2
gio/win32/meson.build
View File

@ -12,4 +12,4 @@ giowin32_lib = static_library('giowin32',
include_directories : [configinc, glibinc, gioinc, gmoduleinc], include_directories : [configinc, glibinc, gioinc, gmoduleinc],
dependencies : [libintl, gioenumtypes_dep], dependencies : [libintl, gioenumtypes_dep],
pic : true, pic : true,
c_args : [ '-DG_DISABLE_DEPRECATED' ] + gio_c_args) c_args : gio_c_args)

2
gmodule/meson.build
View File

@ -103,7 +103,7 @@ libgmodule = library('gmodule-2.0',
install : true, install : true,
include_directories : [configinc, gmoduleinc], include_directories : [configinc, gmoduleinc],
dependencies : [libdl_dep, libglib_dep], dependencies : [libdl_dep, libglib_dep],
c_args : ['-DG_LOG_DOMAIN="GModule"', '-DG_DISABLE_DEPRECATED'] + glib_hidden_visibility_args, c_args : ['-DG_LOG_DOMAIN="GModule"'] + glib_hidden_visibility_args,
link_args : [glib_link_flags], link_args : [glib_link_flags],
) )