From 69ac78cef9505f334cf61d13825371ce0c67ca16 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Mon, 4 Feb 2008 23:54:08 +0000 Subject: Added bogus G_GNUC_MALLOC to restore GLib 2.4 compatibility (hopefully). --- bitlbee.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'bitlbee.h') diff --git a/bitlbee.h b/bitlbee.h index 23ec64b1..55687e3b 100644 --- a/bitlbee.h +++ b/bitlbee.h @@ -98,6 +98,12 @@ #define F_OK 0 #endif +#ifndef G_GNUC_MALLOC +/* Doesn't exist in GLib <=2.4 while everything else in BitlBee should + work with it, so let's fake this one. */ +#define G_GNUC_MALLOC +#endif + #define _( x ) x #define ROOT_NICK "root" -- cgit v1.2.3 From eeb85a8a880fefe655eb31b6322136b61ee969e2 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Mon, 11 Feb 2008 12:35:01 +0000 Subject: Got rid of some noise at startup: complaining when the default configuration file couldn't be found while the user specified an alternative location with the -c option, and double complaints about /var/lib/bitlbee/ permissions. --- bitlbee.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'bitlbee.h') diff --git a/bitlbee.h b/bitlbee.h index 55687e3b..c118d7fc 100644 --- a/bitlbee.h +++ b/bitlbee.h @@ -121,8 +121,6 @@ #define HELP_FILE VARDIR "help.txt" #define CONF_FILE_DEF ETCDIR "bitlbee.conf" -extern char *CONF_FILE; - #include "irc.h" #include "storage.h" #include "set.h" @@ -144,6 +142,7 @@ typedef struct global { int listen_socket; gint listen_watch_source_id; help_t *help; + char *conf_file; conf_t *conf; GList *storage; /* The first backend in the list will be used for saving */ char *helpfile; -- cgit v1.2.3