X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=conffile.y;h=7837abe651365c12e460f4492db4f39da5f825d6;hp=1a8ef364a215567579bbf5fb230d0bf75b5ce0fd;hb=090dbeef60c7e578950c3dbe807a9e2ea7e24875;hpb=fe5e9cc422cd72526ccfceffbc7e5af8ac83b407

diff --git a/conffile.y b/conffile.y
index 1a8ef36..7837abe 100644
--- a/conffile.y
+++ b/conffile.y
@@ -8,8 +8,15 @@
 #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"
 #include "util.h"
 #define YYERROR_VERBOSE