# HG changeset patch # User Richard Laager # Date 1190991618 0 # Node ID ec021d436c429e76170325f21767e8b3bd8d9e19 # Parent 3ae22bbdaeff4225f0b5bf75d00c825cd88f8729 applied changes from f4700a52b60d8473e9671ceabfec7772211fe424 through 936cdaa27fea9a9673ee31a184af0a30d9471abe diff -r 3ae22bbdaeff -r ec021d436c42 libpurple/plugins/debug_example.c --- a/libpurple/plugins/debug_example.c Fri Sep 28 14:54:23 2007 +0000 +++ b/libpurple/plugins/debug_example.c Fri Sep 28 15:00:18 2007 +0000 @@ -27,6 +27,16 @@ /* We're including glib.h again for the gboolean type. */ #include +/* 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. */ diff -r 3ae22bbdaeff -r ec021d436c42 libpurple/plugins/helloworld.c --- a/libpurple/plugins/helloworld.c Fri Sep 28 14:54:23 2007 +0000 +++ b/libpurple/plugins/helloworld.c Fri Sep 28 15:00:18 2007 +0000 @@ -33,6 +33,16 @@ #include +/* 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 #include #include diff -r 3ae22bbdaeff -r ec021d436c42 libpurple/plugins/notify_example.c --- a/libpurple/plugins/notify_example.c Fri Sep 28 14:54:23 2007 +0000 +++ b/libpurple/plugins/notify_example.c Fri Sep 28 15:00:18 2007 +0000 @@ -26,6 +26,16 @@ #include +/* 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. */