chiark
/
gitweb
/
~ian
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logging: Persistent children include pid in their log messages
[secnet.git]
/
conffile.y
diff --git
a/conffile.y
b/conffile.y
index 1a8ef364a215567579bbf5fb230d0bf75b5ce0fd..7837abe651365c12e460f4492db4f39da5f825d6 100644
(file)
--- a/
conffile.y
+++ b/
conffile.y
@@
-8,8
+8,15
@@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#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 "secnet.h"
#include "conffile_internal.h"
+#include "conffile.yy.h"
#include "util.h"
#define YYERROR_VERBOSE
#include "util.h"
#define YYERROR_VERBOSE