summaryrefslogtreecommitdiff
path: root/glib
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-03-25 13:20:13 -0400
committerDan Winship <danw@gnome.org>2014-03-29 12:54:29 -0400
commit31694f9ccbb8a142998252288cd04d9738451a7f (patch)
treeb9f423bb0069d363053c2f7517da1aae2ccb5326 /glib
parent8792609e15394967cab526838b83f90acb401663 (diff)
Bump version to 2.41.0, add GLIB_VERSION_2_42, etc
Diffstat (limited to 'glib')
-rw-r--r--glib/gversionmacros.h24
1 files changed, 24 insertions, 0 deletions
diff --git a/glib/gversionmacros.h b/glib/gversionmacros.h
index 78c1e7e70..403fca0af 100644
--- a/glib/gversionmacros.h
+++ b/glib/gversionmacros.h
@@ -115,6 +115,16 @@
*/
#define GLIB_VERSION_2_40 (G_ENCODE_VERSION (2, 40))
+/**
+ * GLIB_VERSION_2_42:
+ *
+ * A macro that evaluates to the 2.42 version of GLib, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 2.42
+ */
+#define GLIB_VERSION_2_42 (G_ENCODE_VERSION (2, 42))
+
/* evaluates to the current stable version; for development cycles,
* this means the next stable target
*/
@@ -318,4 +328,18 @@
# define GLIB_AVAILABLE_IN_2_40 _GLIB_EXTERN
#endif
+#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_42
+# define GLIB_DEPRECATED_IN_2_42 GLIB_DEPRECATED
+# define GLIB_DEPRECATED_IN_2_42_FOR(f) GLIB_DEPRECATED_FOR(f)
+#else
+# define GLIB_DEPRECATED_IN_2_42 _GLIB_EXTERN
+# define GLIB_DEPRECATED_IN_2_42_FOR(f) _GLIB_EXTERN
+#endif
+
+#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_42
+# define GLIB_AVAILABLE_IN_2_42 GLIB_UNAVAILABLE(2, 42)
+#else
+# define GLIB_AVAILABLE_IN_2_42 _GLIB_EXTERN
+#endif
+
#endif /* __G_VERSION_MACROS_H__ */