*** empty log message ***

[bpt/guile.git] / libguile / read.c

diff --git a/libguile/read.c b/libguile/read.c
index 6f7b7dd..7af3b73 100644 (file)
--- a/libguile/read.c
+++ b/libguile/read.c
@@ -47,7 +47,6 @@
 #include <stdio.h>
 #include "_scm.h"
 #include "chars.h"
-#include "genio.h"
 #include "eval.h"
 #include "unif.h"
 #include "keywords.h"
@@ -55,6 +54,10 @@
 #include "srcprop.h"
 #include "hashtab.h"
 #include "hash.h"
+#include "ports.h"
+#include "root.h"
+#include "strings.h"
+#include "vectors.h"
 
 #include "validate.h"
 #include "read.h"
@@ -70,7 +73,7 @@ scm_option scm_read_opts[] = {
     "Record positions of source code expressions." },
   { SCM_OPTION_BOOLEAN, "case-insensitive", 0,
     "Convert symbols to lower case."},
-  { SCM_OPTION_SCM, "keywords", SCM_BOOL_F,
+  { SCM_OPTION_SCM, "keywords", SCM_UNPACK (SCM_BOOL_F),
     "Style of keyword recognition: #f or 'prefix"}
 };
 
@@ -489,7 +492,7 @@ tryagain_no_flush_ws:
       goto tok;
 
     case ':':
-      if (SCM_KEYWORD_STYLE == scm_keyword_prefix)
+      if (SCM_PACK (SCM_KEYWORD_STYLE) == scm_keyword_prefix)
        {
          j = scm_read_token ('-', tok_buf, port, 0);
          p = scm_intern (SCM_CHARS (*tok_buf), j);
@@ -784,3 +787,9 @@ scm_init_read ()
   scm_init_opts (scm_read_options, scm_read_opts, SCM_N_READ_OPTIONS);
 #include "read.x"
 }
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/