From 82b7005785a1af167db93ac7059a1e3cc88f2938 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 7 Jul 2004 22:18:03 +0000 Subject: [PATCH] (key): add HAVE_FLEXLEXER_YY_CURRENT_BUFFER check. --- ChangeLog | 4 ++++ SConstruct | 23 ++++++++++++++++++++--- lily/key-engraver.cc | 2 +- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16c783384d..90d724fc65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-07-08 Han-Wen Nienhuys + + * SConstruct (key): add HAVE_FLEXLEXER_YY_CURRENT_BUFFER check. + 2004-07-07 Jan Nieuwenhuizen * buildscripts/mf-to-table.py: Do not try to open ''. diff --git a/SConstruct b/SConstruct index 366a5f94d2..027ff60512 100644 --- a/SConstruct +++ b/SConstruct @@ -78,10 +78,14 @@ if env['debugging']: env.Append (CXXFLAGS = '-g') if env['optimising']: env.Append (CFLAGS = '-O2') - env.Append (CXXFLAGS = '-O2 -DSTRING_UTILS_INLINED') + env.Append (CXXFLAGS = '-O2') + env.Append (CXXFLAGS = '-DSTRING_UTILS_INLINED') if env['warnings']: - env.Append (CFLAGS = '-W -Wall') - env.Append (CXXFLAGS = '-W -Wall -Wconversion') + env.Append (CFLAGS = '-W ') + env.Append (CFLAGS = '-Wall') + env.Append (CXXFLAGS = '-W') + env.Append (CXXFLAGS = '-Wall') + env.Append (CXXFLAGS = '-Wconversion') env['MFMODE'] = 'ljfour' @@ -120,6 +124,19 @@ for i in functions: key = re.sub ('[./]', '_', 'zHAVE_' + string.upper (i)) defines[key] = '1' + +key = 'HAVE_FLEXLEXER_YY_CURRENT_BUFFER' +defines[key] = conf.TryCompile("""using namespace std; +#include +class yy_flex_lexer: public yyFlexLexer +{ + public: + yy_flex_lexer () + { + yy_current_buffer = 0; + } +};""", 'cc') + if conf.CheckLib ('dl'): pass diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index 6bff182773..e856460f79 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -161,7 +161,7 @@ Key_engraver::read_ev (Music const * r) context ()->set_property ("keySignature", accs); context ()->set_property ("tonic" , - r->get_property ("tonic")); + r->get_property ("tonic")); } -- 2.39.2