patch::: 1.5.12.jcn1

1.5.12.jcn1
===========

* guile-1.4 compile fix.

1.5.12
======

diff --git a/CHANGES b/CHANGES
index 03b0f11b8b537f586aae71e31a78cb30fd6cacc9..d0c262d784d11748b6424e7b34e755fb8daf40f7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+1.5.12.jcn1
+===========
+
+* guile-1.4 compile fix.
+
+1.5.12
+======
+
 1.5.11.jcn1
 ===========
 

diff --git a/VERSION b/VERSION
index cdb7a38a661865e2b35db9728b57675d01a7edb5..54ed4d82aedd7fead3d4390ada0002671db45258 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=12
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index a765be93e9fa7d17b746190ccb176b81fbe26602..2d9883c2eb7a8e1abf7aeed786a3e5eaf0345a53 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -41,6 +41,7 @@
 #define scm_primitive_eval(form) fix_guile_1_4_scm_primitive_eval (form)
 
 #define scm_c_define_gsubr scm_make_gsubr
+#define scm_c_eval_string(str) gh_eval_str ((char*)str)
 #define scm_c_memq scm_sloppy_memq
 #define scm_gc_protect_object scm_protect_object
 #define scm_gc_unprotect_object scm_unprotect_object