GNOME.org
 

[glib] Revert "glib: annotate static inline functions with G_AVAILABLE-type macros"

commit c0146be3a4e0cda7a23d7fd54cc60a0bc7ba7f7a
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Tue May 12 21:28:52 2020 +0000

    Revert "glib: annotate static inline functions with G_AVAILABLE-type macros"
    
    This reverts commit 50502987495ad55b5168e23b0c0283924881a8b3

 docs/reference/glib/glib-sections.txt |  6 ------
 docs/reference/meson.build            |  4 +---
 glib/gmacros.h                        |  1 -
 glib/gmain.h                          |  2 --
 glib/gmem.h                           |  1 -
 glib/gthread.h                        |  8 --------
 glib/gversionmacros.h                 | 10 ----------
 7 files changed, 1 insertion(+), 31 deletions(-)
---
diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index 6628d2322..b1d78ccc3 100644
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -207,11 +207,6 @@ 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_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_TYPE_IN_2_26
 GLIB_AVAILABLE_TYPE_IN_2_28
 GLIB_AVAILABLE_TYPE_IN_2_30
@@ -711,7 +706,6 @@ GLIB_DEPRECATED_FOR
 GLIB_UNAVAILABLE
 GLIB_UNAVAILABLE_ENUMERATOR
 GLIB_UNAVAILABLE_MACRO
-GLIB_UNAVAILABLE_STATIC_INLINE
 GLIB_UNAVAILABLE_TYPE
 G_ANALYZER_ANALYZING
 G_ANALYZER_NORETURN
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 7c3e589ab..873aa6dc1 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -26,8 +26,6 @@ foreach version : stable_2_series_versions
     'GLIB_DEPRECATED_IN_2_' + version + '_FOR()',
     'GLIB_DEPRECATED_IN_2_' + version,
 
-    'GLIB_AVAILABLE_STATIC_INLINE_IN_2_' + version,
-
     'GLIB_AVAILABLE_ENUMERATOR_IN_2_' + version,
     'GLIB_DEPRECATED_ENUMERATOR_IN_2_' + version + '_FOR()',
     'GLIB_DEPRECATED_ENUMERATOR_IN_2_' + version,
@@ -59,4 +57,4 @@ endif
 
 subdir('gio')
 subdir('glib')
-subdir('gobject')
+subdir('gobject')
\ No newline at end of file
diff --git a/glib/gmacros.h b/glib/gmacros.h
index 7210f0247..45a7874ef 100644
--- a/glib/gmacros.h
+++ b/glib/gmacros.h
@@ -982,7 +982,6 @@
 #define GLIB_DEPRECATED G_DEPRECATED _GLIB_EXTERN
 #define GLIB_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) _GLIB_EXTERN
 #define GLIB_UNAVAILABLE(maj,min) G_UNAVAILABLE(maj,min) _GLIB_EXTERN
-#define GLIB_UNAVAILABLE_STATIC_INLINE(maj,min) G_UNAVAILABLE(maj,min)
 #endif
 
 #if !defined(GLIB_DISABLE_DEPRECATION_WARNINGS) && \
diff --git a/glib/gmain.h b/glib/gmain.h
index 5c0e524cc..d4776c19b 100644
--- a/glib/gmain.h
+++ b/glib/gmain.h
@@ -499,7 +499,6 @@ typedef void GMainContextPusher GLIB_AVAILABLE_TYPE_IN_2_64;
  * Since: 2.64
  */
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-GLIB_AVAILABLE_STATIC_INLINE_IN_2_64
 static inline GMainContextPusher *
 g_main_context_pusher_new (GMainContext *main_context)
 {
@@ -521,7 +520,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
  * Since: 2.64
  */
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-GLIB_AVAILABLE_STATIC_INLINE_IN_2_64
 static inline void
 g_main_context_pusher_free (GMainContextPusher *pusher)
 {
diff --git a/glib/gmem.h b/glib/gmem.h
index 45671073b..953a0182d 100644
--- a/glib/gmem.h
+++ b/glib/gmem.h
@@ -197,7 +197,6 @@ gpointer g_try_realloc_n  (gpointer  mem,
  *
  * Since: 2.44
  */
-GLIB_AVAILABLE_STATIC_INLINE_IN_2_44
 static inline gpointer
 g_steal_pointer (gpointer pp)
 {
diff --git a/glib/gthread.h b/glib/gthread.h
index 96f536916..980522bba 100644
--- a/glib/gthread.h
+++ b/glib/gthread.h
@@ -317,7 +317,6 @@ typedef void GMutexLocker;
  * Returns: a #GMutexLocker
  * Since: 2.44
  */
-GLIB_AVAILABLE_STATIC_INLINE_IN_2_44
 static inline GMutexLocker *
 g_mutex_locker_new (GMutex *mutex)
 {
@@ -335,7 +334,6 @@ g_mutex_locker_new (GMutex *mutex)
  *
  * Since: 2.44
  */
-GLIB_AVAILABLE_STATIC_INLINE_IN_2_44
 static inline void
 g_mutex_locker_free (GMutexLocker *locker)
 {
@@ -393,7 +391,6 @@ typedef void GRecMutexLocker;
  * Since: 2.60
  */
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-GLIB_AVAILABLE_STATIC_INLINE_IN_2_60
 static inline GRecMutexLocker *
 g_rec_mutex_locker_new (GRecMutex *rec_mutex)
 {
@@ -413,7 +410,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
  * Since: 2.60
  */
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-GLIB_AVAILABLE_STATIC_INLINE_IN_2_60
 static inline void
 g_rec_mutex_locker_free (GRecMutexLocker *locker)
 {
@@ -503,7 +499,6 @@ typedef void GRWLockWriterLocker;
  * Since: 2.62
  */
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-GLIB_AVAILABLE_STATIC_INLINE_IN_2_62
 static inline GRWLockWriterLocker *
 g_rw_lock_writer_locker_new (GRWLock *rw_lock)
 {
@@ -524,7 +519,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
  * Since: 2.62
  */
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-GLIB_AVAILABLE_STATIC_INLINE_IN_2_62
 static inline void
 g_rw_lock_writer_locker_free (GRWLockWriterLocker *locker)
 {
@@ -558,7 +552,6 @@ typedef void GRWLockReaderLocker;
  * Since: 2.62
  */
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-GLIB_AVAILABLE_STATIC_INLINE_IN_2_62
 static inline GRWLockReaderLocker *
 g_rw_lock_reader_locker_new (GRWLock *rw_lock)
 {
@@ -579,7 +572,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
  * Since: 2.62
  */
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-GLIB_AVAILABLE_STATIC_INLINE_IN_2_62
 static inline void
 g_rw_lock_reader_locker_free (GRWLockReaderLocker *locker)
 {
diff --git a/glib/gversionmacros.h b/glib/gversionmacros.h
index 08bf7d042..fd86ade02 100644
--- a/glib/gversionmacros.h
+++ b/glib/gversionmacros.h
@@ -646,13 +646,11 @@
 
 #if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_44
 # define GLIB_AVAILABLE_IN_2_44                 GLIB_UNAVAILABLE(2, 44)
-# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_44   GLIB_UNAVAILABLE_STATIC_INLINE(2, 44)
 # define GLIB_AVAILABLE_MACRO_IN_2_44           GLIB_UNAVAILABLE_MACRO(2, 44)
 # define GLIB_AVAILABLE_ENUMERATOR_IN_2_44      GLIB_UNAVAILABLE_ENUMERATOR(2, 44)
 # define GLIB_AVAILABLE_TYPE_IN_2_44            GLIB_UNAVAILABLE_TYPE(2, 44)
 #else
 # define GLIB_AVAILABLE_IN_2_44                 _GLIB_EXTERN
-# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_44
 # define GLIB_AVAILABLE_MACRO_IN_2_44
 # define GLIB_AVAILABLE_ENUMERATOR_IN_2_44
 # define GLIB_AVAILABLE_TYPE_IN_2_44
@@ -900,13 +898,11 @@
 
 #if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_60
 # define GLIB_AVAILABLE_IN_2_60                 GLIB_UNAVAILABLE(2, 60)
-# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_60   GLIB_UNAVAILABLE_STATIC_INLINE(2, 60)
 # define GLIB_AVAILABLE_MACRO_IN_2_60           GLIB_UNAVAILABLE_MACRO(2, 60)
 # define GLIB_AVAILABLE_ENUMERATOR_IN_2_60      GLIB_UNAVAILABLE_ENUMERATOR(2, 60)
 # define GLIB_AVAILABLE_TYPE_IN_2_60            GLIB_UNAVAILABLE_TYPE(2, 60)
 #else
 # define GLIB_AVAILABLE_IN_2_60                 _GLIB_EXTERN
-# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_60
 # define GLIB_AVAILABLE_MACRO_IN_2_60
 # define GLIB_AVAILABLE_ENUMERATOR_IN_2_60
 # define GLIB_AVAILABLE_TYPE_IN_2_60
@@ -934,13 +930,11 @@
 
 #if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_62
 # define GLIB_AVAILABLE_IN_2_62                 GLIB_UNAVAILABLE(2, 62)
-# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_62   GLIB_UNAVAILABLE_STATIC_INLINE(2, 62)
 # define GLIB_AVAILABLE_MACRO_IN_2_62           GLIB_UNAVAILABLE_MACRO(2, 62)
 # define GLIB_AVAILABLE_ENUMERATOR_IN_2_62      GLIB_UNAVAILABLE_ENUMERATOR(2, 62)
 # define GLIB_AVAILABLE_TYPE_IN_2_62            GLIB_UNAVAILABLE_TYPE(2, 62)
 #else
 # define GLIB_AVAILABLE_IN_2_62                 _GLIB_EXTERN
-# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_62
 # define GLIB_AVAILABLE_MACRO_IN_2_62
 # define GLIB_AVAILABLE_ENUMERATOR_IN_2_62
 # define GLIB_AVAILABLE_TYPE_IN_2_62
@@ -968,13 +962,11 @@
 
 #if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_64
 # define GLIB_AVAILABLE_IN_2_64                 GLIB_UNAVAILABLE(2, 64)
-# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_64   GLIB_UNAVAILABLE_STATIC_INLINE(2, 64)
 # define GLIB_AVAILABLE_MACRO_IN_2_64           GLIB_UNAVAILABLE_MACRO(2, 64)
 # define GLIB_AVAILABLE_ENUMERATOR_IN_2_64      GLIB_UNAVAILABLE_ENUMERATOR(2, 64)
 # define GLIB_AVAILABLE_TYPE_IN_2_64            GLIB_UNAVAILABLE_TYPE(2, 64)
 #else
 # define GLIB_AVAILABLE_IN_2_64                 _GLIB_EXTERN
-# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_64
 # define GLIB_AVAILABLE_MACRO_IN_2_64
 # define GLIB_AVAILABLE_ENUMERATOR_IN_2_64
 # define GLIB_AVAILABLE_TYPE_IN_2_64
@@ -1002,13 +994,11 @@
 
 #if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_66
 # define GLIB_AVAILABLE_IN_2_66                 GLIB_UNAVAILABLE(2, 66)
-# define GLIB_AVAILABLE_STATIC_INLINE_IN_2_66   GLIB_UNAVAILABLE_STATIC_INLINE(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_STATIC_INLINE_IN_2_66
 # define GLIB_AVAILABLE_MACRO_IN_2_66
 # define GLIB_AVAILABLE_ENUMERATOR_IN_2_66
 # define GLIB_AVAILABLE_TYPE_IN_2_66
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]