aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2008-02-04 23:54:08 +0000
committerWilmer van der Gaast <wilmer@gaast.net>2008-02-04 23:54:08 +0000
commit69ac78cef9505f334cf61d13825371ce0c67ca16 (patch)
treeadfb4652ddceab92e4187575c99adba5e8a03e60
parent63075d7345355dde6e490ad00a886a1b165dbe17 (diff)
Added bogus G_GNUC_MALLOC to restore GLib 2.4 compatibility (hopefully).
-rw-r--r--bitlbee.h6
-rw-r--r--crypting.c5
2 files changed, 7 insertions, 4 deletions
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"
diff --git a/crypting.c b/crypting.c
index 2a17a913..34b99034 100644
--- a/crypting.c
+++ b/crypting.c
@@ -28,10 +28,7 @@
included if CRYPTING_MAIN is defined. Or just do "make decode" and
the programs will be built. */
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <glib.h>
+#include <bitlbee.h>
#include "md5.h"
#include "crypting.h"