patch::: 1.5.15.jcn1

1.5.15.jcn1
===========

* Fixes for latest guile cvs.

* Add --enable-optimising flag to configure (Huh?).

* Only inline string utlis when optimising.

* Compile fix.

1.5.15
======

diff --git a/CHANGES b/CHANGES
index f2a922ccbdda644926a658b727b8f2a98146ba42..8f29695d35a6c2131b8c54c7197fb5b8e76c8362 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,17 @@
+1.5.15.jcn1
+===========
+
+* Fixes for latest guile cvs.
+
+* Add --enable-optimising flag to configure (Huh?).
+
+* Only inline string utlis when optimising.
+
+* Compile fix.
+
+1.5.15
+======
+
 1.5.14.jcn6
 ===========
 

diff --git a/VERSION b/VERSION
index f5c31f1b08b54aa24e698cd743114a20b5611016..e5b6a8e3181a269056495128f888538d0569d4fa 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=15
-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/aclocal.m4 b/aclocal.m4
index 1cf59b1171348ba86c1f508011fbae7647f86123..3003cbd938eec27cd4eb075798847334cab0a441 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -31,6 +31,10 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [
     [  --enable-debugging      compile with debugging info.  Default: on],
     [debug_b=$enableval])
 
+    AC_ARG_ENABLE(optimising,
+    [  --enable-optimising      compile with optimising.  Default: on],
+    [optimise_b=$enableval])
+
     AC_ARG_ENABLE(profiling, 
     [  --enable-profiling      compile with gprof support.  Default: off],
     [profile_b=$enableval])

diff --git a/configure.in b/configure.in
index e0fa5a2f5d1bd01e73f2d62955d321c053fa4055..e64d0e859d0b75e486d21446ffa27fe98d18428a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -17,9 +17,6 @@ AC_STEPMAKE_COMPILE
 AC_HAVE_HEADERS(assert.h sys/stat.h)
 AC_HEADER_STAT
 
-DEFINES="$DEFINES -DSTRING_UTILS_INLINED"
-AC_DEFINE(STRINGS_UTILS_INLINED)
-
 AC_STEPMAKE_CXX
 AC_STEPMAKE_GXX
 AC_STEPMAKE_CXXTEMPLATE
@@ -34,6 +31,13 @@ AC_STEPMAKE_GUILE
 AC_STEPMAKE_KPATHSEA
 AC_STEPMAKE_BIBTEX2HTML
 
+
+if test "$optimise_b" = yes; then
+    DEFINES="$DEFINES -DSTRING_UTILS_INLINED"
+    AC_DEFINE(STRINGS_UTILS_INLINED)
+fi
+
+
 dnl should check out -print
 dnl huh?
 dnl AC_CHECK_SEARCH_RESULT($FIND, find, Please use --enable-tex-dir)

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index e613c2041c4387b8aa56f6d71404146b3801a867..f554b13f9dc47324ae09aa35ef33bfd378ceb472 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -11,8 +11,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <math.h>              // isinf
-
+#include <math.h>   /* isinf */
+#include <string.h> /* strdup, strchr */
 #include "libc-extension.hh"
 #include "lily-guile.hh"
 #include "main.hh"
@@ -391,7 +391,7 @@ ly_number2string (SCM s)
 
   char str[400];                       // ugh.
 
-  if (scm_integer_p (s) == SCM_BOOL_F)
+  if (scm_exact_p (s) == SCM_BOOL_F)
     {
       Real r (gh_scm2double (s));
 

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 157115741b1b174ee7c94e76fcfbecedc85abff8..4c1f865fd25735656f6a7bc592ecb5eb6092be58 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -172,7 +172,7 @@ Paper_outputter::output_scope (Scope *scope, String prefix)
        {
          output_String_def (prefix + s, ly_scm2string (v));
        }
-      else if (scm_integer_p (v) == SCM_BOOL_T)
+      else if (scm_exact_p (v) == SCM_BOOL_T)
        {
          output_int_def (prefix + s, gh_scm2int (v));    
        }

diff --git a/modules/midi.c b/modules/midi.c
index 1228d1c50f474b6160822b1a3637384a42095bdc..28216e66b7494e4c23f2feec4168cd36a0ce4978 100644 (file)
--- a/modules/midi.c
+++ b/modules/midi.c
@@ -286,8 +286,8 @@ midi_parse_track (unsigned char **track, unsigned char *track_end)
 #endif
 
   debug_print ("%s", "\n");
-  if (!strcmp (*track, "MTrk"))
-    return midi_error ("parse_track(): MTrk expected");
+  if (strcmp (*track, "MTrk"))
+    return midi_error (__FUNCTION__ ": MTrk expected");
   
   *track += 4;
 
@@ -299,7 +299,8 @@ midi_parse_track (unsigned char **track, unsigned char *track_end)
   debug_print ("track begin: %p\n", track);
   debug_print ("track end: %p\n", track + track_len);
   
-  //assert (track_len <= track_size);
+  if (track_len > track_size)
+    return midi_error (__FUNCTION__ ": track size corrupt");
 
   pytrack = PyList_New (0);
 
@@ -341,7 +342,7 @@ pymidi_parse_track (PyObject *self, PyObject *args)
     return 0;
 
   if (track_size < 0)
-    return midi_error ("negative track size");
+    return midi_error (__FUNCTION__  ": negative track size");
 
   track_end = track + track_size;
   
@@ -364,13 +365,13 @@ midi_parse (unsigned char **midi,unsigned  char *midi_end)
 
   
   if (header_len < 6)
-    return midi_error ("header too short");
+    return midi_error (__FUNCTION__ ": header too short");
     
   format = get_number (midi, *midi + 2, 2);
   tracks = get_number (midi, *midi + 2, 2);
 
   if (tracks > 32)
-    return midi_error ("too many tracks");
+    return midi_error (__FUNCTION__ ": too many tracks");
   
   division = get_number (midi, *midi + 2, 2) * 4;
 
@@ -404,7 +405,7 @@ pymidi_parse (PyObject *self, PyObject *args)
     return 0;
 
   if (strcmp (midi, "MThd"))
-      return midi_error ("MThd expected");
+      return midi_error (__FUNCTION__ ": MThd expected");
   
   midi += 4;
 

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 1cf59b1171348ba86c1f508011fbae7647f86123..3003cbd938eec27cd4eb075798847334cab0a441 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -31,6 +31,10 @@ AC_DEFUN(AC_STEPMAKE_COMPILE, [
     [  --enable-debugging      compile with debugging info.  Default: on],
     [debug_b=$enableval])
 
+    AC_ARG_ENABLE(optimising,
+    [  --enable-optimising      compile with optimising.  Default: on],
+    [optimise_b=$enableval])
+
     AC_ARG_ENABLE(profiling, 
     [  --enable-profiling      compile with gprof support.  Default: off],
     [profile_b=$enableval])