From eb2f5c1e0f0ffef490334434469fe9fe33d68cf6 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@gnome.org>
Date: Wed, 5 Sep 2012 09:44:24 -0400
Subject: [PATCH] Add GLIB_VERSION_2_36 and related

---
 docs/reference/glib/glib-sections.txt |  2 ++
 glib/gversionmacros.h                 | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index 2ca7bfa98..aacb2cc8d 100644
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -118,6 +118,8 @@ GLIB_VERSION_2_26
 GLIB_VERSION_2_28
 GLIB_VERSION_2_30
 GLIB_VERSION_2_32
+GLIB_VERSION_2_34
+GLIB_VERSION_2_36
 GLIB_VERSION_MIN_REQUIRED
 GLIB_VERSION_MAX_ALLOWED
 GLIB_DISABLE_DEPRECATION_WARNINGS
diff --git a/glib/gversionmacros.h b/glib/gversionmacros.h
index ed8a5ce9c..04718ce57 100644
--- a/glib/gversionmacros.h
+++ b/glib/gversionmacros.h
@@ -87,6 +87,16 @@
  */
 #define GLIB_VERSION_2_34       (G_ENCODE_VERSION (2, 34))
 
+/**
+ * GLIB_VERSION_2_36:
+ *
+ * A macro that evaluates to the 2.36 version of GLib, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 2.36
+ */
+#define GLIB_VERSION_2_36       (G_ENCODE_VERSION (2, 36))
+
 /* evaluates to the current stable version; for development cycles,
  * this means the next stable target
  */
@@ -247,4 +257,18 @@
 # define GLIB_AVAILABLE_IN_2_34
 #endif
 
+#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_36
+# define GLIB_DEPRECATED_IN_2_36                GLIB_DEPRECATED
+# define GLIB_DEPRECATED_IN_2_36_FOR(f)         GLIB_DEPRECATED_FOR(f)
+#else
+# define GLIB_DEPRECATED_IN_2_36
+# define GLIB_DEPRECATED_IN_2_36_FOR(f)
+#endif
+
+#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_36
+# define GLIB_AVAILABLE_IN_2_36                 GLIB_UNAVAILABLE(2, 36)
+#else
+# define GLIB_AVAILABLE_IN_2_36
+#endif
+
 #endif /*  __G_VERSION_MACROS_H__ */