From da0d9757e7cfd74ec4674b558cb382421735f514 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert.bragg@intel.com>
Date: Mon, 23 Feb 2015 18:31:49 +0000
Subject: [PATCH] Add version 1.2 define + macros

---
 cogl/cogl-macros.h  | 14 ++++++++++++++
 cogl/cogl-version.h | 10 ++++++++++
 2 files changed, 24 insertions(+)

diff --git a/cogl/cogl-macros.h b/cogl/cogl-macros.h
index 17708f9e0..96c06591f 100644
--- a/cogl/cogl-macros.h
+++ b/cogl/cogl-macros.h
@@ -270,4 +270,18 @@
 # define COGL_AVAILABLE_IN_1_18
 #endif
 
+#if COGL_VERSION_MIN_REQUIRED >= COGL_VERSION_1_20
+# define COGL_DEPRECATED_IN_1_20             COGL_DEPRECATED
+# define COGL_DEPRECATED_IN_1_20_FOR(f)      COGL_DEPRECATED_FOR(f)
+#else
+# define COGL_DEPRECATED_IN_1_20
+# define COGL_DEPRECATED_IN_1_20_FOR(f)
+#endif
+
+#if COGL_VERSION_MAX_ALLOWED < COGL_VERSION_1_20
+# define COGL_AVAILABLE_IN_1_20              COGL_UNAVAILABLE(1, 18)
+#else
+# define COGL_AVAILABLE_IN_1_20
+#endif
+
 #endif /* __COGL_MACROS_H__ */
diff --git a/cogl/cogl-version.h b/cogl/cogl-version.h
index 743018844..bc82437ba 100644
--- a/cogl/cogl-version.h
+++ b/cogl/cogl-version.h
@@ -321,6 +321,16 @@
  */
 #define COGL_VERSION_1_18 (COGL_VERSION_ENCODE (1, 18, 0))
 
+/**
+ * COGL_VERSION_1_20:
+ *
+ * A macro that evaluates to the 1.20 version of Cogl, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 1.20
+ */
+#define COGL_VERSION_1_20 (COGL_VERSION_ENCODE (1, 20, 0))
+
 /* evaluates to the current stable version; for development cycles,
  * this means the next stable target
  */