* lily/stencil-expression.cc: idem.

* lily/grob-interface-scheme.cc (LY_DEFINE): idem.

* lily/function-documentation.cc (ly_add_function_documentation):
use static member iso. Protected_scm

* lily/main.cc: use ifdef ARGV0_RELOCATION iso. MINGW

* config.make.in (prefix): remove HAVE_KPATHSEA_SO

diff --git a/ChangeLog b/ChangeLog
index affb81ba29204a87dac6bf4dfdaaf80d54a2a4d7..24f760965bade9ba37dcc91c271d6349506c3123 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-12-28  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/stencil-expression.cc: idem.
+
+       * lily/grob-interface-scheme.cc (LY_DEFINE): idem.
+
+       * lily/function-documentation.cc (ly_add_function_documentation):
+       use static member iso. Protected_scm
+
+       * lily/main.cc: use ifdef ARGV0_RELOCATION iso. MINGW
+
+       * config.make.in (prefix): remove HAVE_KPATHSEA_SO
+
 2005-12-27  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/relocate.cc (set_env_dir): New function.

diff --git a/config.make.in b/config.make.in
index 2f59f5786ca61f2dbed3959e38d380b7e90d12a7..9ff945e856c0fa12eef594e4dd65b3e114f2251b 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -31,8 +31,6 @@ PACKAGE = @PACKAGE@
 package = @package@
 PACKAGE_NAME = @PACKAGE_NAME@
 
-HAVE_LIBKPATHSEA_SO = @HAVE_LIBKPATHSEA_SO@
-
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 

diff --git a/lily/function-documentation.cc b/lily/function-documentation.cc
index 9a1fb9daefdfba3c9de8d2e1ea885ca56cf33fca..82a761e6b5391f2ee0e31a0b8b1344a296519132 100644 (file)
--- a/lily/function-documentation.cc
+++ b/lily/function-documentation.cc
@@ -9,10 +9,10 @@
 #include <cstring>
 using namespace std;
 
-#include "protected-scm.hh"
 #include "string.hh"
+#include "lily-guile.hh"
 
-static Protected_scm doc_hash_table;
+static SCM doc_hash_table;
 
 void ly_add_function_documentation (SCM func,
                                    char const *fname,
@@ -22,8 +22,8 @@ void ly_add_function_documentation (SCM func,
   if (!strlen (doc))
     return;
 
-  if (scm_hash_table_p (doc_hash_table) != SCM_BOOL_T)
-    doc_hash_table = scm_c_make_hash_table (59);
+  if (!doc_hash_table)
+    doc_hash_table = scm_permanent_object (scm_c_make_hash_table (59));
 
   String s = String (" - ") + "LilyPond procedure: " + fname + " " + varlist
     + "\n" + doc;

diff --git a/lily/grob-interface-scheme.cc b/lily/grob-interface-scheme.cc
index 288d55a939741abdfd8bb277110613e34c21953d..633db2b115c46cc783d97a4f4a01f61379de688a 100644 (file)
--- a/lily/grob-interface-scheme.cc
+++ b/lily/grob-interface-scheme.cc
@@ -7,10 +7,9 @@
 */
 
 #include "lily-guile.hh"
-#include "protected-scm.hh"
 #include "string.hh"
 
-Protected_scm all_ifaces;
+static SCM all_ifaces;
 
 LY_DEFINE (ly_add_interface, "ly:add-interface",
           3, 0, 0, (SCM a, SCM b, SCM c),
@@ -19,9 +18,13 @@ LY_DEFINE (ly_add_interface, "ly:add-interface",
   SCM_ASSERT_TYPE (scm_is_symbol (a), a, SCM_ARG1, __FUNCTION__, "symbol");
   SCM_ASSERT_TYPE (scm_is_string (b), b, SCM_ARG2, __FUNCTION__, "string");
   SCM_ASSERT_TYPE (ly_is_list (c), c, SCM_ARG3, __FUNCTION__, "list of syms");
-  if (!scm_is_vector (all_ifaces))
-    all_ifaces = scm_make_vector (scm_from_int (40), SCM_EOL);
-
+  if (!all_ifaces)
+    {
+      SCM tab = scm_c_make_hash_table (59);
+      all_ifaces = tab;
+      scm_permanent_object (tab);
+    }
+  
   SCM entry = scm_list_n (a, b, c, SCM_UNDEFINED);
 
   scm_hashq_set_x (all_ifaces, a, entry);

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index 168a120f41fa1f84be6ef724c22a7ae4f4ba9140..8c68171fa92eaae76f688c8286c475f0384eb4f4 100644 (file)
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -108,6 +108,7 @@ Grob::internal_get_property (SCM sym) const
 
 #ifndef NDEBUG
 #include "protected-scm.hh"
+
 Protected_scm grob_property_callback_stack = SCM_EOL;
 bool debug_property_callbacks = 0;
 #endif

diff --git a/lily/main.cc b/lily/main.cc
index d7505465e4cf52b56407b793fc105cb76649ecb8..f97f00a287eb104af78cb8efa21c13c4d4310612 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -87,7 +87,7 @@ bool make_print = true;
 
 
 bool relocate_binary =
-#ifdef __MINGW32__  
+#ifdef ARGV0_RELOCATION
   true;
 #else
   false

diff --git a/lily/stencil-expression.cc b/lily/stencil-expression.cc
index fb60ae26f8458e8c865fcd6f900e06239c56fdf5..072952ac59291a12cf33c0425ff79a03e219536a 100644 (file)
--- a/lily/stencil-expression.cc
+++ b/lily/stencil-expression.cc
@@ -9,15 +9,17 @@
 
 #include "stencil.hh"
 
-#include "protected-scm.hh"
-
-static Protected_scm heads = SCM_EOL;
+static SCM heads;
 
 void register_stencil_head (SCM symbol)
 {
+  if (!heads)
+    heads = scm_permanent_object (scm_cons (SCM_EOL, SCM_EOL));
+  
   scm_set_object_property_x (symbol, ly_symbol2scm ("stencil-head?"), SCM_BOOL_T);
-  heads = scm_cons (symbol, heads);
+  scm_set_cdr_x (heads,  scm_cons (symbol, heads));
 }
+
 bool
 is_stencil_head (SCM symbol)
 {
@@ -28,6 +30,6 @@ is_stencil_head (SCM symbol)
 SCM
 all_stencil_heads ()
 {
-  return heads;
+  return scm_cdr (heads);
 }