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

gversionmacros: add 2.46 version macros

Browse Source
This commit is contained in:
Dan Winship 2015-03-06 13:43:37 -05:00
parent 7c70377abf
commit 15c5e643c6
2 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/reference/glib/glib-sections.txt
View File

@ -126,6 +126,7 @@ GLIB_VERSION_2_38
GLIB_VERSION_2_40 GLIB_VERSION_2_40
GLIB_VERSION_2_42 GLIB_VERSION_2_42
GLIB_VERSION_2_44 GLIB_VERSION_2_44
GLIB_VERSION_2_46
GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_MIN_REQUIRED
GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_MAX_ALLOWED
GLIB_DISABLE_DEPRECATION_WARNINGS GLIB_DISABLE_DEPRECATION_WARNINGS
@ -143,6 +144,7 @@ GLIB_AVAILABLE_IN_2_38
GLIB_AVAILABLE_IN_2_40 GLIB_AVAILABLE_IN_2_40
GLIB_AVAILABLE_IN_2_42 GLIB_AVAILABLE_IN_2_42
GLIB_AVAILABLE_IN_2_44 GLIB_AVAILABLE_IN_2_44
GLIB_AVAILABLE_IN_2_46
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
@ -163,6 +165,8 @@ GLIB_DEPRECATED_IN_2_42
GLIB_DEPRECATED_IN_2_42_FOR GLIB_DEPRECATED_IN_2_42_FOR
GLIB_DEPRECATED_IN_2_44 GLIB_DEPRECATED_IN_2_44
GLIB_DEPRECATED_IN_2_44_FOR GLIB_DEPRECATED_IN_2_44_FOR
GLIB_DEPRECATED_IN_2_46
GLIB_DEPRECATED_IN_2_46_FOR
GLIB_VERSION_CUR_STABLE GLIB_VERSION_CUR_STABLE
GLIB_VERSION_PREV_STABLE GLIB_VERSION_PREV_STABLE
</SECTION> </SECTION>

44
glib/gversionmacros.h
View File

@ -125,6 +125,26 @@
*/ */
#define GLIB_VERSION_2_42 (G_ENCODE_VERSION (2, 42)) #define GLIB_VERSION_2_42 (G_ENCODE_VERSION (2, 42))
/**
* GLIB_VERSION_2_44:
*
* A macro that evaluates to the 2.44 version of GLib, in a format
* that can be used by the C pre-processor.
*
* Since: 2.44
*/
#define GLIB_VERSION_2_44 (G_ENCODE_VERSION (2, 44))
/**
* GLIB_VERSION_2_46:
*
* A macro that evaluates to the 2.46 version of GLib, in a format
* that can be used by the C pre-processor.
*
* Since: 2.46
*/
#define GLIB_VERSION_2_46 (G_ENCODE_VERSION (2, 46))
/* 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
*/ */
@ -141,16 +161,6 @@
#define GLIB_VERSION_PREV_STABLE (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION - 2)) #define GLIB_VERSION_PREV_STABLE (G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION - 2))
#endif #endif
/**
* GLIB_VERSION_2_44:
*
* A macro that evaluates to the 2.44 version of GLib, in a format
* that can be used by the C pre-processor.
*
* Since: 2.44
*/
#define GLIB_VERSION_2_44 (G_ENCODE_VERSION (2, 44))
/** /**
* GLIB_VERSION_MIN_REQUIRED: * GLIB_VERSION_MIN_REQUIRED:
* *
@ -366,4 +376,18 @@
# define GLIB_AVAILABLE_IN_2_44 _GLIB_EXTERN # define GLIB_AVAILABLE_IN_2_44 _GLIB_EXTERN
#endif #endif
#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_46
# define GLIB_DEPRECATED_IN_2_46 GLIB_DEPRECATED
# define GLIB_DEPRECATED_IN_2_46_FOR(f) GLIB_DEPRECATED_FOR(f)
#else
# define GLIB_DEPRECATED_IN_2_46 _GLIB_EXTERN
# define GLIB_DEPRECATED_IN_2_46_FOR(f) _GLIB_EXTERN
#endif
#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_46
# define GLIB_AVAILABLE_IN_2_46 GLIB_UNAVAILABLE(2, 46)
#else
# define GLIB_AVAILABLE_IN_2_46 _GLIB_EXTERN
#endif
#endif /* __G_VERSION_MACROS_H__ */ #endif /* __G_VERSION_MACROS_H__ */