Correctly implement version macros for Pango

First of all, we need to define `PANGO_UNAVAILABLE`, as it's missing a
definition, and the only reason why nobody caught this is because we're
building without -Wundef, and clearly nobody attempted using
min-required/max-allowed with Pango.

Additionally, we really need a way to disable deprecation warnings from
the compiler.

The complete implementation of the version macros for GLib-based
libraries includes both items above.

1 files changed, 135 insertions, 128 deletions

diff --git a/pango/pango-version-macros.h b/pango/pango-version-macros.h
index 01728aab..5d66ab8c 100644
--- a/pango/pango-version-macros.h
+++ b/pango/pango-version-macros.h
@@ -327,303 +327,310 @@
 /* These macros are used to mark deprecated functions in Pango headers,
  * and thus have to be exposed in installed headers.
  */
-#define PANGO_DEPRECATED                         G_DEPRECATED _PANGO_EXTERN
-#define PANGO_DEPRECATED_FOR(f)                  G_DEPRECATED_FOR(f) _PANGO_EXTERN
+#ifdef PANGO_DISABLE_DEPRECATION_WARNINGS
+# define PANGO_DEPRECATED                       _PANGO_EXTERN
+# define PANGO_DEPRECATED_FOR(f)                _PANGO_EXTERN
+# define PANGO_UNAVAILABLE(maj,min)             _PANGO_EXTERN
+#else
+# define PANGO_DEPRECATED                       G_DEPRECATED _PANGO_EXTERN
+# define PANGO_DEPRECATED_FOR(f)                G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_UNAVAILABLE(maj,min)             G_UNAVAILABLE(maj,min) _PANGO_EXTERN
+#endif
 
 /* XXX: Every new stable minor release should add a set of macros here */
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_2
-# define PANGO_DEPRECATED_IN_1_2                 G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_2_FOR(f)          G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_2                PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_2_FOR(f)         PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_2                 _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_2_FOR(f)          _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_2                _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_2_FOR(f)         _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_2
-# define PANGO_AVAILABLE_IN_1_2                  PANGO_UNAVAILABLE(1, 2)
+# define PANGO_AVAILABLE_IN_1_2                 PANGO_UNAVAILABLE(1, 2)
 #else
-# define PANGO_AVAILABLE_IN_1_2                  _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_2                 _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_4
-# define PANGO_DEPRECATED_IN_1_4                 G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_4_FOR(f)          G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_4                PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_4_FOR(f)         PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_4                 _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_4_FOR(f)          _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_4                _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_4_FOR(f)         _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_4
-# define PANGO_AVAILABLE_IN_1_4                  PANGO_UNAVAILABLE(1, 4)
+# define PANGO_AVAILABLE_IN_1_4                 PANGO_UNAVAILABLE(1, 4)
 #else
-# define PANGO_AVAILABLE_IN_1_4                  _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_4                 _PANGO_EXTERN
 #endif
 
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_6
-# define PANGO_DEPRECATED_IN_1_6                 G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_6_FOR(f)          G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_6                PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_6_FOR(f)         PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_6                 _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_6_FOR(f)          _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_6                _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_6_FOR(f)         _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_6
-# define PANGO_AVAILABLE_IN_1_6                  PANGO_UNAVAILABLE(1, 6)
+# define PANGO_AVAILABLE_IN_1_6                 PANGO_UNAVAILABLE(1, 6)
 #else
-# define PANGO_AVAILABLE_IN_1_6                  _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_6                 _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_8
-# define PANGO_DEPRECATED_IN_1_8                 G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_8_FOR(f)          G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_8                PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_8_FOR(f)         PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_8                 _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_8_FOR(f)          _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_8                _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_8_FOR(f)         _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_8
-# define PANGO_AVAILABLE_IN_1_8                  PANGO_UNAVAILABLE(1, 8)
+# define PANGO_AVAILABLE_IN_1_8                 PANGO_UNAVAILABLE(1, 8)
 #else
-# define PANGO_AVAILABLE_IN_1_8                  _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_8                 _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_10
-# define PANGO_DEPRECATED_IN_1_10                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_10_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_10               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_10_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_10                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_10_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_10               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_10_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_10
-# define PANGO_AVAILABLE_IN_1_10                 PANGO_UNAVAILABLE(1, 10)
+# define PANGO_AVAILABLE_IN_1_10                PANGO_UNAVAILABLE(1, 10)
 #else
-# define PANGO_AVAILABLE_IN_1_10                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_10                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_12
-# define PANGO_AVAILABLE_IN_1_12                 PANGO_UNAVAILABLE(1, 12)
+# define PANGO_AVAILABLE_IN_1_12                PANGO_UNAVAILABLE(1, 12)
 #else
-# define PANGO_AVAILABLE_IN_1_12                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_12                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_12
-# define PANGO_DEPRECATED_IN_1_12                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_12_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_12               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_12_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_12                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_12_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_12               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_12_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_14
-# define PANGO_AVAILABLE_IN_1_14                 PANGO_UNAVAILABLE(1, 14)
+# define PANGO_AVAILABLE_IN_1_14                PANGO_UNAVAILABLE(1, 14)
 #else
-# define PANGO_AVAILABLE_IN_1_14                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_14                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_14
-# define PANGO_DEPRECATED_IN_1_14                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_14_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_14               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_14_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_14                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_14_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_14               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_14_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_16
-# define PANGO_AVAILABLE_IN_1_16                 PANGO_UNAVAILABLE(1, 16)
+# define PANGO_AVAILABLE_IN_1_16                PANGO_UNAVAILABLE(1, 16)
 #else
-# define PANGO_AVAILABLE_IN_1_16                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_16                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_16
-# define PANGO_DEPRECATED_IN_1_16                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_16_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_16               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_16_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_16                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_16_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_16               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_16_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_18
-# define PANGO_DEPRECATED_IN_1_18                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_18_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_18               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_18_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_18                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_18_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_18               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_18_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_18
-# define PANGO_AVAILABLE_IN_1_18                 PANGO_UNAVAILABLE(1, 18)
+# define PANGO_AVAILABLE_IN_1_18                PANGO_UNAVAILABLE(1, 18)
 #else
-# define PANGO_AVAILABLE_IN_1_18                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_18                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_20
-# define PANGO_DEPRECATED_IN_1_20                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_20_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_20               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_20_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_20                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_20_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_20               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_20_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_20
-# define PANGO_AVAILABLE_IN_1_20                 PANGO_UNAVAILABLE(1, 20)
+# define PANGO_AVAILABLE_IN_1_20                PANGO_UNAVAILABLE(1, 20)
 #else
-# define PANGO_AVAILABLE_IN_1_20                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_20                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_22
-# define PANGO_DEPRECATED_IN_1_22                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_22_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_22               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_22_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_22                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_22_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_22               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_22_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_22
-# define PANGO_AVAILABLE_IN_1_22                 PANGO_UNAVAILABLE(1, 22)
+# define PANGO_AVAILABLE_IN_1_22                PANGO_UNAVAILABLE(1, 22)
 #else
-# define PANGO_AVAILABLE_IN_1_22                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_22                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_24
-# define PANGO_DEPRECATED_IN_1_24                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_24_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_24               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_24_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_24                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_24_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_24               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_24_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_24
-# define PANGO_AVAILABLE_IN_1_24                 PANGO_UNAVAILABLE(1, 24)
+# define PANGO_AVAILABLE_IN_1_24                PANGO_UNAVAILABLE(1, 24)
 #else
-# define PANGO_AVAILABLE_IN_1_24                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_24                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_26
-# define PANGO_DEPRECATED_IN_1_26                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_26_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_26               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_26_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_26                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_26_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_26               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_26_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_26
-# define PANGO_AVAILABLE_IN_1_26                 PANGO_UNAVAILABLE(1, 26)
+# define PANGO_AVAILABLE_IN_1_26                PANGO_UNAVAILABLE(1, 26)
 #else
-# define PANGO_AVAILABLE_IN_1_26                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_26                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_28
-# define PANGO_DEPRECATED_IN_1_28                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_28_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_28               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_28_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_28                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_28_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_28               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_28_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_28
-# define PANGO_AVAILABLE_IN_1_28                 PANGO_UNAVAILABLE(1, 28)
+# define PANGO_AVAILABLE_IN_1_28                PANGO_UNAVAILABLE(1, 28)
 #else
-# define PANGO_AVAILABLE_IN_1_28                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_28                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_30
-# define PANGO_DEPRECATED_IN_1_30                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_30_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_30               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_30_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_30                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_30_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_30               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_30_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_30
-# define PANGO_AVAILABLE_IN_1_30                 PANGO_UNAVAILABLE(1, 30)
+# define PANGO_AVAILABLE_IN_1_30                PANGO_UNAVAILABLE(1, 30)
 #else
-# define PANGO_AVAILABLE_IN_1_30                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_30                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_32
-# define PANGO_DEPRECATED_IN_1_32                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_32_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_32               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_32_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_32                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_32_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_32               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_32_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_32
-# define PANGO_AVAILABLE_IN_1_32                 PANGO_UNAVAILABLE(1, 32)
+# define PANGO_AVAILABLE_IN_1_32                PANGO_UNAVAILABLE(1, 32)
 #else
-# define PANGO_AVAILABLE_IN_1_32                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_32                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_34
-# define PANGO_DEPRECATED_IN_1_34                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_34_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_34               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_34_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_34                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_34_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_34               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_34_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_34
-# define PANGO_AVAILABLE_IN_1_34                 PANGO_UNAVAILABLE(1, 34)
+# define PANGO_AVAILABLE_IN_1_34                PANGO_UNAVAILABLE(1, 34)
 #else
-# define PANGO_AVAILABLE_IN_1_34                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_34                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_36
-# define PANGO_DEPRECATED_IN_1_36                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_36_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_36               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_36_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_36                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_36_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_36               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_36_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_36
-# define PANGO_AVAILABLE_IN_1_36                 PANGO_UNAVAILABLE(1, 36)
+# define PANGO_AVAILABLE_IN_1_36                PANGO_UNAVAILABLE(1, 36)
 #else
-# define PANGO_AVAILABLE_IN_1_36                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_36                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_38
-# define PANGO_DEPRECATED_IN_1_38                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_38_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_38               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_38_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_38                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_38_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_38               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_38_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_38
-# define PANGO_AVAILABLE_IN_1_38                 PANGO_UNAVAILABLE(1, 38)
+# define PANGO_AVAILABLE_IN_1_38                PANGO_UNAVAILABLE(1, 38)
 #else
-# define PANGO_AVAILABLE_IN_1_38                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_38                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_40
-# define PANGO_DEPRECATED_IN_1_40                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_40_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_40               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_40_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_40                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_40_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_40               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_40_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_40
-# define PANGO_AVAILABLE_IN_1_40                 PANGO_UNAVAILABLE(1, 40)
+# define PANGO_AVAILABLE_IN_1_40                PANGO_UNAVAILABLE(1, 40)
 #else
-# define PANGO_AVAILABLE_IN_1_40                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_40                _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MIN_REQUIRED >= PANGO_VERSION_1_42
-# define PANGO_DEPRECATED_IN_1_42                G_DEPRECATED _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_42_FOR(f)         G_DEPRECATED_FOR(f) _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_42               PANGO_DEPRECATED
+# define PANGO_DEPRECATED_IN_1_42_FOR(f)        PANGO_DEPRECATED_FOR(f)
 #else
-# define PANGO_DEPRECATED_IN_1_42                _PANGO_EXTERN
-# define PANGO_DEPRECATED_IN_1_42_FOR(f)         _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_42               _PANGO_EXTERN
+# define PANGO_DEPRECATED_IN_1_42_FOR(f)        _PANGO_EXTERN
 #endif
 
 #if PANGO_VERSION_MAX_ALLOWED < PANGO_VERSION_1_42
-# define PANGO_AVAILABLE_IN_1_42                 PANGO_UNAVAILABLE(1, 42)
+# define PANGO_AVAILABLE_IN_1_42                PANGO_UNAVAILABLE(1, 42)
 #else
-# define PANGO_AVAILABLE_IN_1_42                 _PANGO_EXTERN
+# define PANGO_AVAILABLE_IN_1_42                _PANGO_EXTERN
 #endif
 
 #endif /* __PANGO_VERSION_H__ */