GNOME.org
 

[glib: 2/3] gversionmacros: Add version macros for GLib 2.68


commit c51a8ce8c803243844e918c635bc76f05e1570ad
Author: Philip Withnall <pwithnall endlessos org>
Date:   Thu Oct 1 14:33:21 2020 +0100

    gversionmacros: Add version macros for GLib 2.68
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>

 docs/reference/gio/gio-docs.xml         |  4 +++
 docs/reference/glib/glib-docs.xml       |  4 +++
 docs/reference/glib/glib-sections.txt   | 14 +++++++++++
 docs/reference/gobject/gobject-docs.xml |  4 +++
 docs/reference/meson.build              |  2 +-
 glib/gversionmacros.h                   | 44 +++++++++++++++++++++++++++++++++
 6 files changed, 71 insertions(+), 1 deletion(-)
---
diff --git a/docs/reference/gio/gio-docs.xml b/docs/reference/gio/gio-docs.xml
index 565c20c71..9cd3d0e39 100644
--- a/docs/reference/gio/gio-docs.xml
+++ b/docs/reference/gio/gio-docs.xml
@@ -385,6 +385,10 @@
     <title>Index of new symbols in 2.66</title>
     <xi:include href="xml/api-index-2.66.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-2-68" role="2.68">
+    <title>Index of new symbols in 2.68</title>
+    <xi:include href="xml/api-index-2.68.xml"><xi:fallback /></xi:include>
+  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 
diff --git a/docs/reference/glib/glib-docs.xml b/docs/reference/glib/glib-docs.xml
index 38228ca0a..e464fb792 100644
--- a/docs/reference/glib/glib-docs.xml
+++ b/docs/reference/glib/glib-docs.xml
@@ -284,6 +284,10 @@
     <title>Index of new symbols in 2.66</title>
     <xi:include href="xml/api-index-2.66.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-2-68" role="2.68">
+    <title>Index of new symbols in 2.68</title>
+    <xi:include href="xml/api-index-2.68.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 d38fccf40..39a4e1401 100644
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -137,6 +137,7 @@ GLIB_VERSION_2_60
 GLIB_VERSION_2_62
 GLIB_VERSION_2_64
 GLIB_VERSION_2_66
+GLIB_VERSION_2_68
 GLIB_VERSION_MIN_REQUIRED
 GLIB_VERSION_MAX_ALLOWED
 GLIB_DISABLE_DEPRECATION_WARNINGS
@@ -164,6 +165,7 @@ 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_ENUMERATOR_IN_2_68
 GLIB_AVAILABLE_IN_ALL
 GLIB_AVAILABLE_IN_2_26
 GLIB_AVAILABLE_IN_2_28
@@ -186,6 +188,7 @@ GLIB_AVAILABLE_IN_2_60
 GLIB_AVAILABLE_IN_2_62
 GLIB_AVAILABLE_IN_2_64
 GLIB_AVAILABLE_IN_2_66
+GLIB_AVAILABLE_IN_2_68
 GLIB_AVAILABLE_MACRO_IN_2_26
 GLIB_AVAILABLE_MACRO_IN_2_28
 GLIB_AVAILABLE_MACRO_IN_2_30
@@ -207,11 +210,13 @@ 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_MACRO_IN_2_68
 GLIB_AVAILABLE_STATIC_INLINE_IN_2_44
 GLIB_AVAILABLE_STATIC_INLINE_IN_2_60
 GLIB_AVAILABLE_STATIC_INLINE_IN_2_62
 GLIB_AVAILABLE_STATIC_INLINE_IN_2_64
 GLIB_AVAILABLE_STATIC_INLINE_IN_2_66
+GLIB_AVAILABLE_STATIC_INLINE_IN_2_68
 GLIB_AVAILABLE_TYPE_IN_2_26
 GLIB_AVAILABLE_TYPE_IN_2_28
 GLIB_AVAILABLE_TYPE_IN_2_30
@@ -233,6 +238,7 @@ 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_AVAILABLE_TYPE_IN_2_68
 GLIB_DEPRECATED_ENUMERATOR
 GLIB_DEPRECATED_ENUMERATOR_FOR
 GLIB_DEPRECATED_ENUMERATOR_IN_2_26
@@ -277,6 +283,8 @@ 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_ENUMERATOR_IN_2_68
+GLIB_DEPRECATED_ENUMERATOR_IN_2_68_FOR
 GLIB_DEPRECATED_IN_2_26
 GLIB_DEPRECATED_IN_2_26_FOR
 GLIB_DEPRECATED_IN_2_28
@@ -319,6 +327,8 @@ GLIB_DEPRECATED_IN_2_64
 GLIB_DEPRECATED_IN_2_64_FOR
 GLIB_DEPRECATED_IN_2_66
 GLIB_DEPRECATED_IN_2_66_FOR
+GLIB_DEPRECATED_IN_2_68
+GLIB_DEPRECATED_IN_2_68_FOR
 GLIB_DEPRECATED_MACRO
 GLIB_DEPRECATED_MACRO_FOR
 GLIB_DEPRECATED_MACRO_IN_2_26
@@ -363,6 +373,8 @@ 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_MACRO_IN_2_68
+GLIB_DEPRECATED_MACRO_IN_2_68_FOR
 GLIB_DEPRECATED_TYPE
 GLIB_DEPRECATED_TYPE_FOR
 GLIB_DEPRECATED_TYPE_IN_2_26
@@ -407,6 +419,8 @@ 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_DEPRECATED_TYPE_IN_2_68
+GLIB_DEPRECATED_TYPE_IN_2_68_FOR
 GLIB_VERSION_CUR_STABLE
 GLIB_VERSION_PREV_STABLE
 </SECTION>
diff --git a/docs/reference/gobject/gobject-docs.xml b/docs/reference/gobject/gobject-docs.xml
index 74cfcd976..ddbc9f274 100644
--- a/docs/reference/gobject/gobject-docs.xml
+++ b/docs/reference/gobject/gobject-docs.xml
@@ -204,6 +204,10 @@
     <title>Index of new symbols in 2.66</title>
     <xi:include href="xml/api-index-2.66.xml"><xi:fallback /></xi:include>
   </index>
+  <index id="api-index-2-68" role="2.68">
+    <title>Index of new symbols in 2.68</title>
+    <xi:include href="xml/api-index-2.68.xml"><xi:fallback /></xi:include>
+  </index>
 
   <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index a676af12d..3f09be555 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', '66',
+  '60', '62', '64', '66', '68',
 ]
 
 ignore_decorators = [
diff --git a/glib/gversionmacros.h b/glib/gversionmacros.h
index 08bf7d042..c2e8f1d90 100644
--- a/glib/gversionmacros.h
+++ b/glib/gversionmacros.h
@@ -245,6 +245,16 @@
  */
 #define GLIB_VERSION_2_66       (G_ENCODE_VERSION (2, 66))
 
+/**
+ * GLIB_VERSION_2_68:
+ *
+ * A macro that evaluates to the 2.68 version of GLib, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 2.68
+ */
+#define GLIB_VERSION_2_68       (G_ENCODE_VERSION (2, 68))
+
 /* evaluates to the current stable version; for development cycles,
  * this means the next stable target
  */
@@ -1014,4 +1024,38 @@
 # define GLIB_AVAILABLE_TYPE_IN_2_66
 #endif
 
+#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68
+# define GLIB_DEPRECATED_IN_2_68                GLIB_DEPRECATED
+# define GLIB_DEPRECATED_IN_2_68_FOR(f)         GLIB_DEPRECATED_FOR(f)
+# define GLIB_DEPRECATED_MACRO_IN_2_68          GLIB_DEPRECATED_MACRO
+# define GLIB_DEPRECATED_MACRO_IN_2_68_FOR(f)   GLIB_DEPRECATED_MACRO_FOR(f)
+# define GLIB_DEPRECATED_ENUMERATOR_IN_2_68          GLIB_DEPRECATED_ENUMERATOR
+# define GLIB_DEPRECATED_ENUMERATOR_IN_2_68_FOR(f)   GLIB_DEPRECATED_ENUMERATOR_FOR(f)
+# define GLIB_DEPRECATED_TYPE_IN_2_68           GLIB_DEPRECATED_TYPE
+# define GLIB_DEPRECATED_TYPE_IN_2_68_FOR(f)    GLIB_DEPRECATED_TYPE_FOR(f)
+#else
+# define GLIB_DEPRECATED_IN_2_68                _GLIB_EXTERN
+# define GLIB_DEPRECATED_IN_2_68_FOR(f)         _GLIB_EXTERN
+# define GLIB_DEPRECATED_MACRO_IN_2_68
+# define GLIB_DEPRECATED_MACRO_IN_2_68_FOR(f)
+# define GLIB_DEPRECATED_ENUMERATOR_IN_2_68
+# define GLIB_DEPRECATED_ENUMERATOR_IN_2_68_FOR(f)
+# define GLIB_DEPRECATED_TYPE_IN_2_68
+# define GLIB_DEPRECATED_TYPE_IN_2_68_FOR(f)
+#endif
+
+#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_68
+# define GLIB_AVAILABLE_IN_2_68                 GLIB_UNAVAILABLE(2, 68)
+# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_68   GLIB_UNAVAILABLE_STATIC_INLINE(2, 68)
+# define GLIB_AVAILABLE_MACRO_IN_2_68           GLIB_UNAVAILABLE_MACRO(2, 68)
+# define GLIB_AVAILABLE_ENUMERATOR_IN_2_68      GLIB_UNAVAILABLE_ENUMERATOR(2, 68)
+# define GLIB_AVAILABLE_TYPE_IN_2_68            GLIB_UNAVAILABLE_TYPE(2, 68)
+#else
+# define GLIB_AVAILABLE_IN_2_68                 _GLIB_EXTERN
+# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_68
+# define GLIB_AVAILABLE_MACRO_IN_2_68
+# define GLIB_AVAILABLE_ENUMERATOR_IN_2_68
+# define GLIB_AVAILABLE_TYPE_IN_2_68
+#endif
+
 #endif /*  __G_VERSION_MACROS_H__ */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]