From 37c76c23cb05889583259f0228daae38d602c666 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 9 Jul 2002 23:30:45 +0000 Subject: [PATCH] * config.hh.in: Add HAVE_SSTREAM. * configure.in: Add check for sstream header. * flower/source-file.cc: Fix compatibility with older g++. (Mats) --- ChangeLog | 10 ++++++++++ Documentation/windows/lilypond.hint | 3 ++- VERSION | 2 +- config.hh.in | 2 ++ configure.in | 3 +-- flower/source-file.cc | 7 ++++++- 6 files changed, 22 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a03f5ed0a..802ed12ee4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2002-07-10 Jan Nieuwenhuizen + + * config.hh.in: Add HAVE_SSTREAM. + + * configure.in: Add check for sstream header. + +2002-07-09 Mats Bengtsson + + * flower/source-file.cc: Fix compatibility with older g++. + 2002-07-09 Jan Nieuwenhuizen * input/twinkle.ly: Bugfix: no automaticMelismata. diff --git a/Documentation/windows/lilypond.hint b/Documentation/windows/lilypond.hint index 2c7e7da48f..517c4038d6 100644 --- a/Documentation/windows/lilypond.hint +++ b/Documentation/windows/lilypond.hint @@ -1,6 +1,7 @@ sdesc: "A program for printing sheet music" category: Publishing -requires: ash bash libguile14 libintl2 python tetex-beta texmf-tiny +# actually, guile needs libtool-devel +requires: ash bash libguile14 libintl2 libtool-devel python tetex-beta texmf-tiny #suggests: emacs gsview lilypond-doc rxvt xdvi texmf-base ldesc: "A program for printing sheet music. LilyPond prints beautiful sheet music. It produces music notation diff --git a/VERSION b/VERSION index e9382179f8..aa342fef99 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 PATCH_LEVEL=66 -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/config.hh.in b/config.hh.in index 6c58034b22..1c16bed76b 100644 --- a/config.hh.in +++ b/config.hh.in @@ -73,6 +73,8 @@ /* define if you have sys/stat.h */ #define STAT_MACROS_BROKEN 0 +/* define if you have sstream */ +#define HAVE_SSTREAM 0 /* GUILE only includes version in headers (libguile/version.h) as of 1.5.x. For some strange reason, they call it SCM.*VERSION. */ diff --git a/configure.in b/configure.in index 3f9bdbef16..7edb9bc87a 100644 --- a/configure.in +++ b/configure.in @@ -35,8 +35,7 @@ STEPMAKE_MAKEINFO(REQUIRED) STEPMAKE_PYTHON_DEVEL(REQUIRED) -# AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h) -AC_HAVE_HEADERS(assert.h sys/stat.h) +AC_HAVE_HEADERS(assert.h sys/stat.h sstream) AC_HEADER_STAT AC_FUNC_MEMCMP diff --git a/flower/source-file.cc b/flower/source-file.cc index 6e607980fe..e8d55966f1 100644 --- a/flower/source-file.cc +++ b/flower/source-file.cc @@ -9,7 +9,12 @@ #include +#if HAVE_SSTREAM #include +#else +#include +#define istringstream(x) istrstream(x, length_i ()) +#endif #include "string.hh" #include "flower-proto.hh" @@ -45,7 +50,7 @@ Source_file::istream_l () if (!istream_p_) { if (length_i ()) // can-t this be done without such a hack? - istream_p_ = new std::stringstream (ch_C ()); + istream_p_ = new std::istringstream (ch_C ()); else { istream_p_ = new std::istringstream (""); -- 2.39.2