dll read_opts revert

diff --git a/ChangeLog b/ChangeLog
index 8c1c007b94ee3d0ed48ed95ebb2491e9295de660..8c80b22fa2067becad1557911bd5360f8d9e5fb4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-08-09  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * 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 7961b9cc5ae43baa3262124edc6f8a99b11d6850..e0cc7b9d3fa066f041528fb6e1389155c1e0a5d6 100644 (file)
--- 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 858c757f5d51bc8586171ac5e87d1b7f1e8f524b..7c50e772fc4e594e5cf2fc602de89aa47b1c46a3 100644 (file)
--- 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);