Mercurial > pidgin.yaz
changeset 20102:e47e8d670bfa
merge of '936cdaa27fea9a9673ee31a184af0a30d9471abe'
and 'b017e4ee0447b76795120d6997db9b26e1a0dfba'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 17 Sep 2007 06:43:16 +0000 |
| parents | 3a5f152e7ed0 (diff) a3f07fa68e90 (current diff) |
| children | 2975adac8c5d |
| files | |
| diffstat | 3 files changed, 30 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/plugins/debug_example.c Mon Sep 17 06:42:08 2007 +0000 +++ b/libpurple/plugins/debug_example.c Mon Sep 17 06:43:16 2007 +0000 @@ -27,6 +27,16 @@ /* We're including glib.h again for the gboolean type. */ #include <glib.h> +/* This will prevent compiler errors in some instances and is better explained in the + * how-to documents on the wiki */ +#ifndef G_GNUC_NULL_TERMINATED +# if __GNUC__ >= 4 +# define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__)) +# else +# define G_GNUC_NULL_TERMINATED +# endif +#endif + /* This is the required definition of PURPLE_PLUGINS as required for a plugin, * but we protect it with an #ifndef because config.h may define it for us * already and this would cause an unneeded compiler warning. */
--- a/libpurple/plugins/helloworld.c Mon Sep 17 06:42:08 2007 +0000 +++ b/libpurple/plugins/helloworld.c Mon Sep 17 06:43:16 2007 +0000 @@ -33,6 +33,16 @@ #include <glib.h> +/* This will prevent compiler errors in some instances and is better explained in the + * how-to documents on the wiki */ +#ifndef G_GNUC_NULL_TERMINATED +# if __GNUC__ >= 4 +# define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__)) +# else +# define G_GNUC_NULL_TERMINATED +# endif +#endif + #include <notify.h> #include <plugin.h> #include <version.h>
--- a/libpurple/plugins/notify_example.c Mon Sep 17 06:42:08 2007 +0000 +++ b/libpurple/plugins/notify_example.c Mon Sep 17 06:43:16 2007 +0000 @@ -26,6 +26,16 @@ #include <glib.h> +/* This will prevent compiler errors in some instances and is better explained in the + * how-to documents on the wiki */ +#ifndef G_GNUC_NULL_TERMINATED +# if __GNUC__ >= 4 +# define G_GNUC_NULL_TERMINATED __attribute__((__sentinel__)) +# else +# define G_GNUC_NULL_TERMINATED +# endif +#endif + /* This is the required definition of PURPLE_PLUGINS as required for a plugin, * but we protect it with an #ifndef because config.h may define it for us * already and this would cause an unneeded compiler warning. */