summaryrefslogtreecommitdiff
path: root/libguile/private-options.h
diff options
context:
space:
mode:
authorMichael Gran <spk121@yahoo.com>2010-01-17 13:40:18 -0800
committerMichael Gran <spk121@yahoo.com>2010-01-17 13:40:18 -0800
commit870d7a2b4f397a4619553b0f9798b6e8b3ed173e (patch)
tree51d77f3458f88e31075bf07e4fe861593461fe1f /libguile/private-options.h
parent445f31fc06d338f0cafda188d0287f935c2edc3c (diff)
downloadguile-870d7a2b4f397a4619553b0f9798b6e8b3ed173e.tar.gz
reader options macros incorrect when SCM_ENABLE_ELISP undefined
When compiled with SCM_ENABLE_ELISP undefined, the reader options macros SCM_R6RS_ESCAPES_P and SCM_SQUARE_BRACKETS_P point past the end of the scm_read_opts struct. *libguile/private-options.h (SCM_R6RS_ESCAPES_P) [!SCM_ENABLE_ELISP]: modified (SCM_SQUARE_BRACKETS_P) [!SCM_ENABLE_ELISP]: modified (SCM_N_READ_OPTIONS): modified
Diffstat (limited to 'libguile/private-options.h')
-rw-r--r--libguile/private-options.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/libguile/private-options.h b/libguile/private-options.h
index f027b72e6..2e9728dce 100644
--- a/libguile/private-options.h
+++ b/libguile/private-options.h
@@ -94,14 +94,17 @@ SCM_API scm_t_option scm_read_opts[];
#if SCM_ENABLE_ELISP
#define SCM_ELISP_VECTORS_P scm_read_opts[4].val
#define SCM_ESCAPED_PARENS_P scm_read_opts[5].val
-#endif
#define SCM_R6RS_ESCAPES_P scm_read_opts[6].val
#define SCM_SQUARE_BRACKETS_P scm_read_opts[7].val
+#else
+#define SCM_R6RS_ESCAPES_P scm_read_opts[4].val
+#define SCM_SQUARE_BRACKETS_P scm_read_opts[5].val
+#endif
#if SCM_ENABLE_ELISP
-#define SCM_N_READ_OPTIONS 7
+#define SCM_N_READ_OPTIONS 8
#else
-#define SCM_N_READ_OPTIONS 5
+#define SCM_N_READ_OPTIONS 6
#endif
#endif /* PRIVATE_OPTIONS */