pidgin/android/libpurple

Fix a warning for glib 2.36 and g_type_init

2013-04-14, Tomasz Wasilczyk
29a7df06f410
Parents 9b112a06cbdc
Children 8a0d96bd9cf4
Fix a warning for glib 2.36 and g_type_init
2 files changed, 10 insertions(+), 3 deletions(-)
  • +1 -0
    libpurple/core.c
  • +9 -3
    libpurple/glibcompat.h
    • --- a/libpurple/core.c Sun Apr 14 01:04:19 2013 +0200
    +++ b/libpurple/core.c Sun Apr 14 01:26:04 2013 +0200
    @@ -33,6 +33,7 @@
    #include "debug.h"
    #include "dnsquery.h"
    #include "ft.h"
    +#include "glibcompat.h"
    #include "http.h"
    #include "idle.h"
    #include "imgstore.h"
    --- a/libpurple/glibcompat.h Sun Apr 14 01:04:19 2013 +0200
    +++ b/libpurple/glibcompat.h Sun Apr 14 01:26:04 2013 +0200
    @@ -25,6 +25,13 @@
    * Also, any public API should not depend on this file.
    */
    +#if GLIB_CHECK_VERSION(2, 36, 0)
    +
    +#define g_type_init()
    +
    +#endif /* >= 2.36.0 */
    +
    +
    #if !GLIB_CHECK_VERSION(2, 32, 0)
    #define G_GNUC_BEGIN_IGNORE_DEPRECATIONS
    @@ -53,9 +60,8 @@
    g_slist_free(list);
    }
    -#endif /* 2.28.0 */
    +#endif /* < 2.28.0 */
    -#endif /* 2.32.0 */
    +#endif /* < 2.32.0 */
    #endif /* _PIDGINGLIBCOMPAT_H_ */
    -