# HG changeset patch # User Sadrul Habib Chowdhury # Date 1182293232 0 # Node ID 7df46d8bf11492336d8744be2ac93114f3acf69b # Parent af15bece709743eaaa365c0b78d118a8789ee5c2 Move the define in internal.h instead. This requires all .c files to include internal.h before including the other headers. Perhaps we should add the define in CFLAGS instead, when necessary. diff -r af15bece7097 -r 7df46d8bf114 libpurple/account.h --- a/libpurple/account.h Tue Jun 19 21:58:56 2007 +0000 +++ b/libpurple/account.h Tue Jun 19 22:47:12 2007 +0000 @@ -31,10 +31,6 @@ #include #include -#ifndef G_GNUC_NULL_TERMINATED -#define G_GNUC_NULL_TERMINATED -#endif - typedef struct _PurpleAccountUiOps PurpleAccountUiOps; typedef struct _PurpleAccount PurpleAccount; diff -r af15bece7097 -r 7df46d8bf114 libpurple/accountopt.c --- a/libpurple/accountopt.c Tue Jun 19 21:58:56 2007 +0000 +++ b/libpurple/accountopt.c Tue Jun 19 22:47:12 2007 +0000 @@ -22,6 +22,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "internal.h" + #include "accountopt.h" #include "util.h" diff -r af15bece7097 -r 7df46d8bf114 libpurple/cmds.c --- a/libpurple/cmds.c Tue Jun 19 21:58:56 2007 +0000 +++ b/libpurple/cmds.c Tue Jun 19 22:47:12 2007 +0000 @@ -22,6 +22,8 @@ #include +#include "internal.h" + #include "account.h" #include "util.h" #include "cmds.h" diff -r af15bece7097 -r 7df46d8bf114 libpurple/imgstore.c --- a/libpurple/imgstore.c Tue Jun 19 21:58:56 2007 +0000 +++ b/libpurple/imgstore.c Tue Jun 19 22:47:12 2007 +0000 @@ -25,6 +25,8 @@ */ #include +#include "internal.h" + #include "dbus-maybe.h" #include "debug.h" #include "imgstore.h" diff -r af15bece7097 -r 7df46d8bf114 libpurple/internal.h --- a/libpurple/internal.h Tue Jun 19 21:58:56 2007 +0000 +++ b/libpurple/internal.h Tue Jun 19 22:47:12 2007 +0000 @@ -170,6 +170,10 @@ # endif #endif +#ifndef G_GNUC_NULL_TERMINATED +# define G_GNUC_NULL_TERMINATED +#endif + /* Safer ways to work with static buffers. When using non-static * buffers, either use g_strdup_* functions (preferred) or use * g_strlcpy/g_strlcpy directly. */ diff -r af15bece7097 -r 7df46d8bf114 libpurple/mime.c --- a/libpurple/mime.c Tue Jun 19 21:58:56 2007 +0000 +++ b/libpurple/mime.c Tue Jun 19 22:47:12 2007 +0000 @@ -29,6 +29,8 @@ #include #include +#include "internal.h" + /* this should become "util.h" if we ever get this into purple proper */ #include "debug.h" #include "mime.h" diff -r af15bece7097 -r 7df46d8bf114 libpurple/ntlm.c --- a/libpurple/ntlm.c Tue Jun 19 21:58:56 2007 +0000 +++ b/libpurple/ntlm.c Tue Jun 19 22:47:12 2007 +0000 @@ -25,6 +25,8 @@ #include #include +#include "internal.h" + #include "util.h" #include "ntlm.h" #include "cipher.h" diff -r af15bece7097 -r 7df46d8bf114 libpurple/request.c --- a/libpurple/request.c Tue Jun 19 21:58:56 2007 +0000 +++ b/libpurple/request.c Tue Jun 19 22:47:12 2007 +0000 @@ -22,6 +22,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "internal.h" + #include "notify.h" #include "request.h" #include "debug.h" diff -r af15bece7097 -r 7df46d8bf114 libpurple/roomlist.c --- a/libpurple/roomlist.c Tue Jun 19 21:58:56 2007 +0000 +++ b/libpurple/roomlist.c Tue Jun 19 22:47:12 2007 +0000 @@ -25,6 +25,8 @@ #include +#include "internal.h" + #include "account.h" #include "connection.h" #include "debug.h" diff -r af15bece7097 -r 7df46d8bf114 libpurple/whiteboard.c --- a/libpurple/whiteboard.c Tue Jun 19 21:58:56 2007 +0000 +++ b/libpurple/whiteboard.c Tue Jun 19 22:47:12 2007 +0000 @@ -23,6 +23,7 @@ #include +#include "internal.h" #include "whiteboard.h" #include "prpl.h"