X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=conffile_internal.h;h=44d0ac7d4ba7dcc864248e7805321fb4f9dc2be8;hp=69ff195e61df742089648fcb6ebec8b5896b7822;hb=328ae477c72b63616f28de2ff3ead9bf8d4752ba;hpb=fe5e9cc422cd72526ccfceffbc7e5af8ac83b407

diff --git a/conffile_internal.h b/conffile_internal.h
index 69ff195..44d0ac7 100644
--- a/conffile_internal.h
+++ b/conffile_internal.h
@@ -4,8 +4,6 @@
 #include <stdio.h>
 #include "secnet.h"
 
-extern FILE *yyin;
-
 typedef cstring_t atom_t;
 
 /* Parse tree for configuration file */
@@ -25,6 +23,8 @@ typedef cstring_t atom_t;
 #define T_ALIST      17
 #define T_ERROR      20
 
+#define T_IS_PRIMITIVE(NTYPE) ((NTYPE) < T_ASSIGNMENT)
+
 struct p_node {
     uint32_t type;
     struct cloc loc;
@@ -37,9 +37,8 @@ struct p_node {
     struct p_node *r;
 };
 
-extern int yylex(void);
 extern cstring_t config_file;
-extern uint32_t config_lineno;
+extern int config_lineno;
 extern int yynerrs;
 
 /* Keys in dictionaries are 'atoms', which are constructed from strings