changeset 20189:ec021d436c42

applied changes from f4700a52b60d8473e9671ceabfec7772211fe424 through 936cdaa27fea9a9673ee31a184af0a30d9471abe
author Richard Laager <rlaager@wiktel.com>
date Fri, 28 Sep 2007 15:00:18 +0000
parents 3ae22bbdaeff
children da6a1320d3e1
files libpurple/plugins/debug_example.c libpurple/plugins/helloworld.c libpurple/plugins/notify_example.c
diffstat 3 files changed, 30 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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 <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	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 <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	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 <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. */