GNOME.org
 

[glib/wip/Jehan/g_param_is_valid_property_name: 2/4] gversionmacros: Add version macros for GLib 2.66

commit b6399b08a631ed5c83dab516e906b3704e6ff153
Author: Philip Withnall <withnall endlessm com>
Date:   Wed Mar 4 14:05:18 2020 +0000

    gversionmacros: Add version macros for GLib 2.66
    
    Signed-off-by: Philip Withnall <withnall endlessm com>

 docs/reference/glib/glib-docs.xml     |  4 ++++
 docs/reference/glib/glib-sections.txt | 13 +++++++++++
 docs/reference/meson.build            |  2 +-
 glib/gversionmacros.h                 | 42 +++++++++++++++++++++++++++++++++++
 4 files changed, 60 insertions(+), 1 deletion(-)
---
diff --git a/docs/reference/glib/glib-docs.xml b/docs/reference/glib/glib-docs.xml
index 186543f06..3ed125652 100644
--- a/docs/reference/glib/glib-docs.xml
+++ b/docs/reference/glib/glib-docs.xml
@@ -280,6 +280,10 @@
     <title>Index of new symbols in 2.64</title>
     <xi:include href="xml/api-index-2.64.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-2-66" role="2.66">
+    <title>Index of new symbols in 2.66</title>
+    <xi:include href="xml/api-index-2.66.xml"><xi:fallback /></xi:include>
+  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 
diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index 63f40baf5..b1d78ccc3 100644
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -136,6 +136,7 @@ GLIB_VERSION_2_58
 GLIB_VERSION_2_60
 GLIB_VERSION_2_62
 GLIB_VERSION_2_64
+GLIB_VERSION_2_66
 GLIB_VERSION_MIN_REQUIRED
 GLIB_VERSION_MAX_ALLOWED
 GLIB_DISABLE_DEPRECATION_WARNINGS
@@ -162,6 +163,7 @@ GLIB_AVAILABLE_ENUMERATOR_IN_2_58
 GLIB_AVAILABLE_ENUMERATOR_IN_2_60
 GLIB_AVAILABLE_ENUMERATOR_IN_2_62
 GLIB_AVAILABLE_ENUMERATOR_IN_2_64
+GLIB_AVAILABLE_ENUMERATOR_IN_2_66
 GLIB_AVAILABLE_IN_ALL
 GLIB_AVAILABLE_IN_2_26
 GLIB_AVAILABLE_IN_2_28
@@ -183,6 +185,7 @@ GLIB_AVAILABLE_IN_2_58
 GLIB_AVAILABLE_IN_2_60
 GLIB_AVAILABLE_IN_2_62
 GLIB_AVAILABLE_IN_2_64
+GLIB_AVAILABLE_IN_2_66
 GLIB_AVAILABLE_MACRO_IN_2_26
 GLIB_AVAILABLE_MACRO_IN_2_28
 GLIB_AVAILABLE_MACRO_IN_2_30
@@ -203,6 +206,7 @@ GLIB_AVAILABLE_MACRO_IN_2_58
 GLIB_AVAILABLE_MACRO_IN_2_60
 GLIB_AVAILABLE_MACRO_IN_2_62
 GLIB_AVAILABLE_MACRO_IN_2_64
+GLIB_AVAILABLE_MACRO_IN_2_66
 GLIB_AVAILABLE_TYPE_IN_2_26
 GLIB_AVAILABLE_TYPE_IN_2_28
 GLIB_AVAILABLE_TYPE_IN_2_30
@@ -223,6 +227,7 @@ GLIB_AVAILABLE_TYPE_IN_2_58
 GLIB_AVAILABLE_TYPE_IN_2_60
 GLIB_AVAILABLE_TYPE_IN_2_62
 GLIB_AVAILABLE_TYPE_IN_2_64
+GLIB_AVAILABLE_TYPE_IN_2_66
 GLIB_DEPRECATED_ENUMERATOR
 GLIB_DEPRECATED_ENUMERATOR_FOR
 GLIB_DEPRECATED_ENUMERATOR_IN_2_26
@@ -265,6 +270,8 @@ GLIB_DEPRECATED_ENUMERATOR_IN_2_62
 GLIB_DEPRECATED_ENUMERATOR_IN_2_62_FOR
 GLIB_DEPRECATED_ENUMERATOR_IN_2_64
 GLIB_DEPRECATED_ENUMERATOR_IN_2_64_FOR
+GLIB_DEPRECATED_ENUMERATOR_IN_2_66
+GLIB_DEPRECATED_ENUMERATOR_IN_2_66_FOR
 GLIB_DEPRECATED_IN_2_26
 GLIB_DEPRECATED_IN_2_26_FOR
 GLIB_DEPRECATED_IN_2_28
@@ -305,6 +312,8 @@ GLIB_DEPRECATED_IN_2_62
 GLIB_DEPRECATED_IN_2_62_FOR
 GLIB_DEPRECATED_IN_2_64
 GLIB_DEPRECATED_IN_2_64_FOR
+GLIB_DEPRECATED_IN_2_66
+GLIB_DEPRECATED_IN_2_66_FOR
 GLIB_DEPRECATED_MACRO
 GLIB_DEPRECATED_MACRO_FOR
 GLIB_DEPRECATED_MACRO_IN_2_26
@@ -347,6 +356,8 @@ GLIB_DEPRECATED_MACRO_IN_2_62
 GLIB_DEPRECATED_MACRO_IN_2_62_FOR
 GLIB_DEPRECATED_MACRO_IN_2_64
 GLIB_DEPRECATED_MACRO_IN_2_64_FOR
+GLIB_DEPRECATED_MACRO_IN_2_66
+GLIB_DEPRECATED_MACRO_IN_2_66_FOR
 GLIB_DEPRECATED_TYPE
 GLIB_DEPRECATED_TYPE_FOR
 GLIB_DEPRECATED_TYPE_IN_2_26
@@ -389,6 +400,8 @@ GLIB_DEPRECATED_TYPE_IN_2_62
 GLIB_DEPRECATED_TYPE_IN_2_62_FOR
 GLIB_DEPRECATED_TYPE_IN_2_64
 GLIB_DEPRECATED_TYPE_IN_2_64_FOR
+GLIB_DEPRECATED_TYPE_IN_2_66
+GLIB_DEPRECATED_TYPE_IN_2_66_FOR
 GLIB_VERSION_CUR_STABLE
 GLIB_VERSION_PREV_STABLE
 </SECTION>
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 0dd821ada..873aa6dc1 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -7,7 +7,7 @@
 stable_2_series_versions = [
   '26', '28', '30', '32', '34', '36', '38',
   '40', '42', '44', '46', '48', '50', '52', '54', '56', '58',
-  '60', '62', '64',
+  '60', '62', '64', '66',
 ]
 
 ignore_decorators = [
diff --git a/glib/gversionmacros.h b/glib/gversionmacros.h
index 07ce76304..fd86ade02 100644
--- a/glib/gversionmacros.h
+++ b/glib/gversionmacros.h
@@ -235,6 +235,16 @@
  */
 #define GLIB_VERSION_2_64       (G_ENCODE_VERSION (2, 64))
 
+/**
+ * GLIB_VERSION_2_66:
+ *
+ * A macro that evaluates to the 2.66 version of GLib, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 2.66
+ */
+#define GLIB_VERSION_2_66       (G_ENCODE_VERSION (2, 66))
+
 /* evaluates to the current stable version; for development cycles,
  * this means the next stable target
  */
@@ -962,4 +972,36 @@
 # define GLIB_AVAILABLE_TYPE_IN_2_64
 #endif
 
+#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_66
+# define GLIB_DEPRECATED_IN_2_66                GLIB_DEPRECATED
+# define GLIB_DEPRECATED_IN_2_66_FOR(f)         GLIB_DEPRECATED_FOR(f)
+# define GLIB_DEPRECATED_MACRO_IN_2_66          GLIB_DEPRECATED_MACRO
+# define GLIB_DEPRECATED_MACRO_IN_2_66_FOR(f)   GLIB_DEPRECATED_MACRO_FOR(f)
+# define GLIB_DEPRECATED_ENUMERATOR_IN_2_66          GLIB_DEPRECATED_ENUMERATOR
+# define GLIB_DEPRECATED_ENUMERATOR_IN_2_66_FOR(f)   GLIB_DEPRECATED_ENUMERATOR_FOR(f)
+# define GLIB_DEPRECATED_TYPE_IN_2_66           GLIB_DEPRECATED_TYPE
+# define GLIB_DEPRECATED_TYPE_IN_2_66_FOR(f)    GLIB_DEPRECATED_TYPE_FOR(f)
+#else
+# define GLIB_DEPRECATED_IN_2_66                _GLIB_EXTERN
+# define GLIB_DEPRECATED_IN_2_66_FOR(f)         _GLIB_EXTERN
+# define GLIB_DEPRECATED_MACRO_IN_2_66
+# define GLIB_DEPRECATED_MACRO_IN_2_66_FOR(f)
+# define GLIB_DEPRECATED_ENUMERATOR_IN_2_66
+# define GLIB_DEPRECATED_ENUMERATOR_IN_2_66_FOR(f)
+# define GLIB_DEPRECATED_TYPE_IN_2_66
+# define GLIB_DEPRECATED_TYPE_IN_2_66_FOR(f)
+#endif
+
+#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_66
+# define GLIB_AVAILABLE_IN_2_66                 GLIB_UNAVAILABLE(2, 66)
+# define GLIB_AVAILABLE_MACRO_IN_2_66           GLIB_UNAVAILABLE_MACRO(2, 66)
+# define GLIB_AVAILABLE_ENUMERATOR_IN_2_66      GLIB_UNAVAILABLE_ENUMERATOR(2, 66)
+# define GLIB_AVAILABLE_TYPE_IN_2_66            GLIB_UNAVAILABLE_TYPE(2, 66)
+#else
+# define GLIB_AVAILABLE_IN_2_66                 _GLIB_EXTERN
+# define GLIB_AVAILABLE_MACRO_IN_2_66
+# define GLIB_AVAILABLE_ENUMERATOR_IN_2_66
+# define GLIB_AVAILABLE_TYPE_IN_2_66
+#endif
+
 #endif /*  __G_VERSION_MACROS_H__ */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]