# HG changeset patch # User Gary Kramlich # Date 1708664134 21600 # Node ID 4f19be7835c2cfedc3f0698cb596a46c08af635d # Parent 5e42cba3e8ad53babe8b782f9accac38bf85933a Define PURPLE_MACRO_UNAVAILABLE and PIDGIN_MACRO_UNAVAILABLE We were using these but didn't have them defined. We were getting away with it because there weren't any pesky kids using older versions. Testing Done: Had the turtles check in on it. Reviewed at https://reviews.imfreedom.org/r/2972/ diff -r 5e42cba3e8ad -r 4f19be7835c2 libpurple/purpleversion.h --- a/libpurple/purpleversion.h Thu Feb 22 22:14:22 2024 -0600 +++ b/libpurple/purpleversion.h Thu Feb 22 22:55:34 2024 -0600 @@ -54,12 +54,14 @@ #define PURPLE_DEPRECATED _PURPLE_EXTERN #define PURPLE_DEPRECATED_FOR(f) _PURPLE_EXTERN #define PURPLE_UNAVAILABLE(maj, min) _PURPLE_EXTERN +#define PURPLE_UNAVAILABLE_MACRO(maj, min) #define PURPLE_UNAVAILABLE_STATIC_INLINE(maj, min) #define PURPLE_UNAVAILABLE_TYPE(maj, min) #else #define PURPLE_DEPRECATED G_DEPRECATED _PURPLE_EXTERN #define PURPLE_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) _PURPLE_EXTERN #define PURPLE_UNAVAILABLE(maj, min) G_UNAVAILABLE(maj, min) _PURPLE_EXTERN +#define PURPLE_UNAVAILABLE_MACRO(maj, min) G_UNAVAILABLE_MACRO(maj, min) #define PURPLE_UNAVAILABLE_STATIC_INLINE(maj, min) G_UNAVAILABLE(maj, min) #define PURPLE_UNAVAILABLE_TYPE(maj, min) G_UNAVAILABLE(maj, min) #endif diff -r 5e42cba3e8ad -r 4f19be7835c2 pidgin/pidginversion.h --- a/pidgin/pidginversion.h Thu Feb 22 22:14:22 2024 -0600 +++ b/pidgin/pidginversion.h Thu Feb 22 22:55:34 2024 -0600 @@ -54,12 +54,14 @@ #define PIDGIN_DEPRECATED _PIDGIN_EXTERN #define PIDGIN_DEPRECATED_FOR(f) _PIDGIN_EXTERN #define PIDGIN_UNAVAILABLE(maj, min) _PIDGIN_EXTERN +#define PIDGIN_UNAVAILABLE_MACRO(maj, min) #define PIDGIN_UNAVAILABLE_STATIC_INLINE(maj, min) #define PIDGIN_UNAVAILABLE_TYPE(maj, min) #else #define PIDGIN_DEPRECATED G_DEPRECATED _PIDGIN_EXTERN #define PIDGIN_DEPRECATED_FOR(f) G_DEPRECATED_FOR(f) _PIDGIN_EXTERN #define PIDGIN_UNAVAILABLE(maj, min) G_UNAVAILABLE(maj, min) _PIDGIN_EXTERN +#define PIDGIN_UNAVAILABLE_MACRO(maj, min) G_UNAVAILABLE_MACRO(maj, min) #define PIDGIN_UNAVAILABLE_STATIC_INLINE(maj, min) G_UNAVAILABLE(maj, min) #define PIDGIN_UNAVAILABLE_TYPE(maj, min) G_UNAVAILABLE(maj, min) #endif