From 2138c1299fe66e356bae5ec1f36ea5bb609be598 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 9 Aug 2002 15:14:12 +0000 Subject: [PATCH] dll read_opts revert --- ChangeLog | 3 +++ lily/main.cc | 13 ------------- lily/parse-scm.cc | 11 ++++++++++- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c1c007b94..8c80b22fa2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2002-08-09 Han-Wen Nienhuys + * lily/parse-scm.cc (protected_ly_parse_scm): compatibility with + CVS GUILE + * input/test/preset-extent.ly (texidoc): added file. * scripts/convert-ly.py: add extent rule. diff --git a/lily/main.cc b/lily/main.cc index 7961b9cc5a..e0cc7b9d3f 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -323,17 +323,6 @@ prepend_load_path (String dir) scm_c_eval_string (s.to_str0 ()); } -/* Move this to libguile/read.h - Note: auto-export is assumed (no __declspec (dllexport)) */ -#if (defined(_WIN32) || defined(__CYGWIN__)) \ - && !(defined(GUILE_BUILD_DLL) || defined(GUILE_STATIC)) -#define DLL_IMPORT __declspec (dllimport) -#else -#define DLL_IMPORT -#endif -extern DLL_IMPORT scm_t_option scm_read_opts[]; - - void main_prog (void *, int, char **) { @@ -348,8 +337,6 @@ main_prog (void *, int, char **) prepend_load_path (String (prefix_directory[i]) + "/scm"); } - SCM_RECORD_POSITIONS_P = 1; - if (verbose_global_b) dirinfo (stderr); diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc index 858c757f5d..7c50e772fc 100644 --- a/lily/parse-scm.cc +++ b/lily/parse-scm.cc @@ -103,10 +103,19 @@ parse_handler (void * data, SCM tag, SCM args) Do some magical incantations: if not, lily will exit on the first GUILE error, leaving no location trace. */ + + +#if GUILE_MINOR_VERSION < 7 + #define READ_ERROR "misc-error" + #else + #define READ_ERROR "read-error" +#endif + SCM protected_ly_parse_scm (Parse_start *ps) { - return scm_internal_catch (ly_symbol2scm ("misc-error"), &catch_protected_parse_body, + return scm_internal_catch (ly_symbol2scm (READ_ERROR), + &catch_protected_parse_body, (void*)ps, &parse_handler, (void*)ps); -- 2.39.5