secnet.h: provide helpful STRING macro (for preprocessor stringification)

[secnet.git] / conffile_internal.h

diff --git a/conffile_internal.h b/conffile_internal.h
index 710fd965245aff592a3cb8805b51016c9115f724..073ab26ba6d51b185ea757bff0d6e29fb6fd7bd0 100644 (file)
--- a/conffile_internal.h
+++ b/conffile_internal.h
@@ -1,16 +1,10 @@
-/*
- * $Log$
- */
-
 #ifndef conffile_internal_h
 #define conffile_internal_h
 
 #include <stdio.h>
 #include "secnet.h"
 
-extern FILE *yyin;
-
-typedef string_t atom_t;
+typedef cstring_t atom_t;
 
 /* Parse tree for configuration file */
 
@@ -41,13 +35,13 @@ struct p_node {
     struct p_node *r;
 };
 
-extern int yylex(void);
-extern string_t config_file;
-extern uint32_t config_lineno;
+extern cstring_t config_file;
+extern int config_lineno;
+extern int yynerrs;
 
 /* Keys in dictionaries are 'atoms', which are constructed from strings
    using this call. Atoms may be compared using '=='. */
-extern atom_t intern(string_t string);
+extern atom_t intern(cstring_t string);
 
 extern struct p_node *parse_conffile(FILE *conffile);