Mon, 31 Oct 2011 07:55:55 +0000
These checks are unnecessary because we require a newer GLib.
--- a/libpurple/plugins/keyrings/gnomekeyring.c Mon Oct 31 07:53:53 2011 +0000 +++ b/libpurple/plugins/keyrings/gnomekeyring.c Mon Oct 31 07:55:55 2011 +0000 @@ -41,14 +41,6 @@ #include <glib.h> #include <gnome-keyring.h> -#ifndef G_GNUC_NULL_TERMINATED -# if __GNUC__ >= 4 -# define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__)) -# else -# define G_GNUC_NULL_TERMINATED -# endif -#endif - #include "account.h" #include "version.h" #include "keyring.h"
--- a/libpurple/plugins/keyrings/internalkeyring.c Mon Oct 31 07:53:53 2011 +0000 +++ b/libpurple/plugins/keyrings/internalkeyring.c Mon Oct 31 07:55:55 2011 +0000 @@ -37,14 +37,6 @@ #include <glib.h> -#ifndef G_GNUC_NULL_TERMINATED -# if __GNUC__ >= 4 -# define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__)) -# else -# define G_GNUC_NULL_TERMINATED -# endif -#endif - #include "account.h" #include "version.h" #include "keyring.h"
--- a/libpurple/plugins/keyrings/kwallet.cpp Mon Oct 31 07:53:53 2011 +0000 +++ b/libpurple/plugins/keyrings/kwallet.cpp Mon Oct 31 07:55:55 2011 +0000 @@ -38,14 +38,6 @@ #include <glib.h> -#ifndef G_GNUC_NULL_TERMINATED - #if __GNUC__ >= 4 - #define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__)) - #else - #define G_GNUC_NULL_TERMINATED - #endif -#endif - #include "account.h" #include "version.h" #include "keyring.h"