luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-16 12:28:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

gversionmacros: add version macros for GLib 2.62

Browse Source 
Signed-off-by: Philip Withnall <withnall@endlessm.com>
This commit is contained in:
Philip Withnall 2019-03-06 11:26:28 +00:00
parent 35db2ffe9c
commit e7d091dec1
4 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/reference/gio/meson.build
View File

@ -141,6 +141,7 @@ if get_option('gtk_doc')
'GLIB_AVAILABLE_IN_2_56', 'GLIB_AVAILABLE_IN_2_56',
'GLIB_AVAILABLE_IN_2_58', 'GLIB_AVAILABLE_IN_2_58',
'GLIB_AVAILABLE_IN_2_60', 'GLIB_AVAILABLE_IN_2_60',
'GLIB_AVAILABLE_IN_2_62',
'GLIB_DEPRECATED_IN_2_26', 'GLIB_DEPRECATED_IN_2_26',
'GLIB_DEPRECATED_IN_2_26_FOR', 'GLIB_DEPRECATED_IN_2_26_FOR',
'GLIB_DEPRECATED_IN_2_28', 'GLIB_DEPRECATED_IN_2_28',
@ -177,6 +178,8 @@ if get_option('gtk_doc')
'GLIB_DEPRECATED_IN_2_58_FOR', 'GLIB_DEPRECATED_IN_2_58_FOR',
'GLIB_DEPRECATED_IN_2_60', 'GLIB_DEPRECATED_IN_2_60',
'GLIB_DEPRECATED_IN_2_60_FOR', 'GLIB_DEPRECATED_IN_2_60_FOR',
'GLIB_DEPRECATED_IN_2_62',
'GLIB_DEPRECATED_IN_2_62_FOR',
] ]
# FIXME: More win32 headers were added to fix building gio-scan # FIXME: More win32 headers were added to fix building gio-scan

3
docs/reference/glib/meson.build
View File

@ -63,6 +63,7 @@ if get_option('gtk_doc')
'GLIB_AVAILABLE_IN_2_56', 'GLIB_AVAILABLE_IN_2_56',
'GLIB_AVAILABLE_IN_2_58', 'GLIB_AVAILABLE_IN_2_58',
'GLIB_AVAILABLE_IN_2_60', 'GLIB_AVAILABLE_IN_2_60',
'GLIB_AVAILABLE_IN_2_62',
'GLIB_DEPRECATED_IN_2_26', 'GLIB_DEPRECATED_IN_2_26',
'GLIB_DEPRECATED_IN_2_26_FOR', 'GLIB_DEPRECATED_IN_2_26_FOR',
'GLIB_DEPRECATED_IN_2_28', 'GLIB_DEPRECATED_IN_2_28',
@ -99,6 +100,8 @@ if get_option('gtk_doc')
'GLIB_DEPRECATED_IN_2_58_FOR', 'GLIB_DEPRECATED_IN_2_58_FOR',
'GLIB_DEPRECATED_IN_2_60', 'GLIB_DEPRECATED_IN_2_60',
'GLIB_DEPRECATED_IN_2_60_FOR', 'GLIB_DEPRECATED_IN_2_60_FOR',
'GLIB_DEPRECATED_IN_2_62',
'GLIB_DEPRECATED_IN_2_62_FOR',
] ]
docpath = join_paths(glib_datadir, 'gtk-doc', 'html') docpath = join_paths(glib_datadir, 'gtk-doc', 'html')

3
docs/reference/gobject/meson.build
View File

@ -33,6 +33,7 @@ if get_option('gtk_doc')
'GLIB_AVAILABLE_IN_2_56', 'GLIB_AVAILABLE_IN_2_56',
'GLIB_AVAILABLE_IN_2_58', 'GLIB_AVAILABLE_IN_2_58',
'GLIB_AVAILABLE_IN_2_60', 'GLIB_AVAILABLE_IN_2_60',
'GLIB_AVAILABLE_IN_2_62',
'GLIB_DEPRECATED_IN_2_26', 'GLIB_DEPRECATED_IN_2_26',
'GLIB_DEPRECATED_IN_2_26_FOR', 'GLIB_DEPRECATED_IN_2_26_FOR',
'GLIB_DEPRECATED_IN_2_28', 'GLIB_DEPRECATED_IN_2_28',
@ -69,6 +70,8 @@ if get_option('gtk_doc')
'GLIB_DEPRECATED_IN_2_58_FOR', 'GLIB_DEPRECATED_IN_2_58_FOR',
'GLIB_DEPRECATED_IN_2_60', 'GLIB_DEPRECATED_IN_2_60',
'GLIB_DEPRECATED_IN_2_60_FOR', 'GLIB_DEPRECATED_IN_2_60_FOR',
'GLIB_DEPRECATED_IN_2_62',
'GLIB_DEPRECATED_IN_2_62_FOR',
] ]
docpath = join_paths(glib_datadir, 'gtk-doc', 'html') docpath = join_paths(glib_datadir, 'gtk-doc', 'html')

24
glib/gversionmacros.h
View File

@ -215,6 +215,16 @@
*/ */
#define GLIB_VERSION_2_60 (G_ENCODE_VERSION (2, 60)) #define GLIB_VERSION_2_60 (G_ENCODE_VERSION (2, 60))
/**
* GLIB_VERSION_2_62:
*
* A macro that evaluates to the 2.62 version of GLib, in a format
* that can be used by the C pre-processor.
*
* Since: 2.62
*/
#define GLIB_VERSION_2_62 (G_ENCODE_VERSION (2, 62))
/* evaluates to the current stable version; for development cycles, /* evaluates to the current stable version; for development cycles,
* this means the next stable target * this means the next stable target
*/ */
@ -558,4 +568,18 @@
# define GLIB_AVAILABLE_IN_2_60 _GLIB_EXTERN # define GLIB_AVAILABLE_IN_2_60 _GLIB_EXTERN
#endif #endif
#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_62
# define GLIB_DEPRECATED_IN_2_62 GLIB_DEPRECATED
# define GLIB_DEPRECATED_IN_2_62_FOR(f) GLIB_DEPRECATED_FOR(f)
#else
# define GLIB_DEPRECATED_IN_2_62 _GLIB_EXTERN
# define GLIB_DEPRECATED_IN_2_62_FOR(f) _GLIB_EXTERN
#endif
#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_62
# define GLIB_AVAILABLE_IN_2_62 GLIB_UNAVAILABLE(2, 62)
#else
# define GLIB_AVAILABLE_IN_2_62 _GLIB_EXTERN
#endif
#endif /* __G_VERSION_MACROS_H__ */ #endif /* __G_VERSION_MACROS_H__ */