X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/fe5e9cc422cd72526ccfceffbc7e5af8ac83b407..86420bb75f19f628ffd2d8ff9964e59ed99e3187:/conffile.y

diff --git a/conffile.y b/conffile.y
index 1a8ef36..9f32cfd 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
 
@@ -96,7 +103,7 @@ static struct p_node *node(uint32_t type, struct p_node *l, struct p_node *r)
 {
 	struct p_node *rv;
 
-	rv=safe_malloc(sizeof(*rv),"p_node");
+	NEW(rv);
 	rv->type=type;
 	rv->loc.file=config_file;
 	rv->loc.line=config_lineno;