(key): add HAVE_FLEXLEXER_YY_CURRENT_BUFFER check.

diff --git a/ChangeLog b/ChangeLog
index 16c783384d19c56a54a1e91047e3eb21a1f2222c..90d724fc651b0f1b701703382424295e5798794b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-08  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * SConstruct (key): add HAVE_FLEXLEXER_YY_CURRENT_BUFFER check.
+
 2004-07-07  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * buildscripts/mf-to-table.py: Do not try to open ''.

diff --git a/SConstruct b/SConstruct
index 366a5f94d21de068c34346f8c133b254d27f3729..027ff605120bdb4f2861edaa96f596a4a29896aa 100644 (file)
--- 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 <FlexLexer.h>
+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 6bff182773b5d9ee4328d220debb36131fa58151..e856460f7987fc77ecd89b6427fc7dca5dadc9bc 100644 (file)
--- 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"));
 }