Fixes for Mac OS x.

diff --git a/src/oconfig.c b/src/oconfig.c
index f8d1849..2bb80cc 100644 (file)
--- a/src/oconfig.c
+++ b/src/oconfig.c
@@ -24,11 +24,15 @@
 
 #include "oconfig.h"
 
-/* Functions provided by the scanner */
-void yyset_in  (FILE *);
+extern FILE *yyin;
 
 oconfig_item_t *ci_root;
 
+static void yyset_in  (FILE *fd)
+{
+  yyin = fd;
+} /* void yyset_in */
+
 oconfig_item_t *oconfig_parse_fh (FILE *fh)
 {
   int status;

diff --git a/src/scanner.l b/src/scanner.l
index aa111a2..646bbc6 100644 (file)
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -22,6 +22,7 @@
 #include "aux_types.h"
 #include "parser.h"
 %}
+%option yylineno
 WHITE_SPACE [\ \t\b]
 QUOTED_STRING \"([^\\"]+|\\.)*\"
 UNQUOTED_STRING [0-9A-Za-z_]+