X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=conffile.y;h=7837abe651365c12e460f4492db4f39da5f825d6;hp=1625122fe762f4a83831eda9c9b3ad55bfd3201b;hb=27ee084e0b458c71d27c48402e4d62dfbf4a83bf;hpb=27f5042b0435d26ae98b22f8e42115e44afe53bc

diff --git a/conffile.y b/conffile.y
index 1625122..7837abe 100644
--- a/conffile.y
+++ b/conffile.y
@@ -8,6 +8,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+/* Bison stupidly redeclares malloc/free unless they are #defined
+ * (or a bunch of madder conditions) */
+#ifndef malloc
+# define malloc malloc
+# define free free
+#endif
 #include "secnet.h"
 #include "conffile_internal.h"
 #include "conffile.yy.h"