changelog, Makefile.in: finalise 0.3.2~beta1

[secnet.git] / conffile.y

diff --git a/conffile.y b/conffile.y
index cd53b7cf88f349d919e9fc0c18af69e46479bd5a..7837abe651365c12e460f4492db4f39da5f825d6 100644 (file)
--- 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
 
@@ -17,7 +24,7 @@ static struct p_node *node(uint32_t type, struct p_node *l, struct p_node *r);
 
 static struct p_node *result;
 
-static void yyerror(char *s);
+static void yyerror(const char *s);
 
 %}
 
@@ -73,7 +80,7 @@ item:           TOK_STRING
 
 %%
 
-static void yyerror(char *s)
+static void yyerror(const char *s)
 {
        Message(M_FATAL,"config file %s line %d: %s\n",config_file,
                config_lineno,s);