diff -r caa6f35efd7a -r e97d93132751 libpurple/glibcompat.h --- a/libpurple/glibcompat.h Wed Apr 09 20:20:21 2014 +0200 +++ b/libpurple/glibcompat.h Thu Apr 10 00:32:00 2014 +0200 @@ -33,21 +33,6 @@ #include - -#ifdef __clang__ - -#undef G_GNUC_BEGIN_IGNORE_DEPRECATIONS -#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS \ - _Pragma ("clang diagnostic push") \ - _Pragma ("clang diagnostic ignored \"-Wdeprecated-declarations\"") - -#undef G_GNUC_END_IGNORE_DEPRECATIONS -#define G_GNUC_END_IGNORE_DEPRECATIONS \ - _Pragma ("clang diagnostic pop") - -#endif /* __clang__ */ - - #if !GLIB_CHECK_VERSION(2, 36, 0) #include @@ -84,6 +69,9 @@ #define G_GNUC_BEGIN_IGNORE_DEPRECATIONS #define G_GNUC_END_IGNORE_DEPRECATIONS +#define G_SOURCE_REMOVE FALSE +#define G_SOURCE_CONTINUE TRUE + #define g_signal_handlers_disconnect_by_data(instance, data) \ g_signal_handlers_disconnect_matched((instance), G_SIGNAL_MATCH_DATA, \ 0, 0, NULL, NULL, (data)) @@ -159,4 +147,18 @@ #endif /* < 2.36.0 */ + +#ifdef __clang__ + +#undef G_GNUC_BEGIN_IGNORE_DEPRECATIONS +#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS \ + _Pragma ("clang diagnostic push") \ + _Pragma ("clang diagnostic ignored \"-Wdeprecated-declarations\"") + +#undef G_GNUC_END_IGNORE_DEPRECATIONS +#define G_GNUC_END_IGNORE_DEPRECATIONS \ + _Pragma ("clang diagnostic pop") + +#endif /* __clang__ */ + #endif /* _GLIBCOMPAT_H_ */