mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-24 18:08:54 +02:00
Merge branch 'version-bump-2.68' into 'master'
Add version macros for 2.68 See merge request GNOME/glib!1674
This commit is contained in:
@@ -245,6 +245,16 @@
|
||||
*/
|
||||
#define GLIB_VERSION_2_66 (G_ENCODE_VERSION (2, 66))
|
||||
|
||||
/**
|
||||
* GLIB_VERSION_2_68:
|
||||
*
|
||||
* A macro that evaluates to the 2.68 version of GLib, in a format
|
||||
* that can be used by the C pre-processor.
|
||||
*
|
||||
* Since: 2.68
|
||||
*/
|
||||
#define GLIB_VERSION_2_68 (G_ENCODE_VERSION (2, 68))
|
||||
|
||||
/* evaluates to the current stable version; for development cycles,
|
||||
* this means the next stable target
|
||||
*/
|
||||
@@ -1014,4 +1024,38 @@
|
||||
# define GLIB_AVAILABLE_TYPE_IN_2_66
|
||||
#endif
|
||||
|
||||
#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68
|
||||
# define GLIB_DEPRECATED_IN_2_68 GLIB_DEPRECATED
|
||||
# define GLIB_DEPRECATED_IN_2_68_FOR(f) GLIB_DEPRECATED_FOR(f)
|
||||
# define GLIB_DEPRECATED_MACRO_IN_2_68 GLIB_DEPRECATED_MACRO
|
||||
# define GLIB_DEPRECATED_MACRO_IN_2_68_FOR(f) GLIB_DEPRECATED_MACRO_FOR(f)
|
||||
# define GLIB_DEPRECATED_ENUMERATOR_IN_2_68 GLIB_DEPRECATED_ENUMERATOR
|
||||
# define GLIB_DEPRECATED_ENUMERATOR_IN_2_68_FOR(f) GLIB_DEPRECATED_ENUMERATOR_FOR(f)
|
||||
# define GLIB_DEPRECATED_TYPE_IN_2_68 GLIB_DEPRECATED_TYPE
|
||||
# define GLIB_DEPRECATED_TYPE_IN_2_68_FOR(f) GLIB_DEPRECATED_TYPE_FOR(f)
|
||||
#else
|
||||
# define GLIB_DEPRECATED_IN_2_68 _GLIB_EXTERN
|
||||
# define GLIB_DEPRECATED_IN_2_68_FOR(f) _GLIB_EXTERN
|
||||
# define GLIB_DEPRECATED_MACRO_IN_2_68
|
||||
# define GLIB_DEPRECATED_MACRO_IN_2_68_FOR(f)
|
||||
# define GLIB_DEPRECATED_ENUMERATOR_IN_2_68
|
||||
# define GLIB_DEPRECATED_ENUMERATOR_IN_2_68_FOR(f)
|
||||
# define GLIB_DEPRECATED_TYPE_IN_2_68
|
||||
# define GLIB_DEPRECATED_TYPE_IN_2_68_FOR(f)
|
||||
#endif
|
||||
|
||||
#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_68
|
||||
# define GLIB_AVAILABLE_IN_2_68 GLIB_UNAVAILABLE(2, 68)
|
||||
# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_68 GLIB_UNAVAILABLE_STATIC_INLINE(2, 68)
|
||||
# define GLIB_AVAILABLE_MACRO_IN_2_68 GLIB_UNAVAILABLE_MACRO(2, 68)
|
||||
# define GLIB_AVAILABLE_ENUMERATOR_IN_2_68 GLIB_UNAVAILABLE_ENUMERATOR(2, 68)
|
||||
# define GLIB_AVAILABLE_TYPE_IN_2_68 GLIB_UNAVAILABLE_TYPE(2, 68)
|
||||
#else
|
||||
# define GLIB_AVAILABLE_IN_2_68 _GLIB_EXTERN
|
||||
# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_68
|
||||
# define GLIB_AVAILABLE_MACRO_IN_2_68
|
||||
# define GLIB_AVAILABLE_ENUMERATOR_IN_2_68
|
||||
# define GLIB_AVAILABLE_TYPE_IN_2_68
|
||||
#endif
|
||||
|
||||
#endif /* __G_VERSION_MACROS_H__ */
|
||||
|
Reference in New Issue
Block a user