patch::: 1.1.3.jcn1: pats

diff --git a/VERSION b/VERSION
index 8ff529cc6aaa867182feb7fc551f5f6ee73ba58d..b3ee0f556a2bb12b84a9c1737f5193e2c981c65a 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=3
-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/audio-column.hh b/lily/include/audio-column.hh
index 9b60c3eb7d50f8c816a36e44d52fe5c96ea3025f..d3f1997b5e2e7dfefc3a154079766639ed0e4cec 100644 (file)
--- a/lily/include/audio-column.hh
+++ b/lily/include/audio-column.hh
@@ -8,6 +8,7 @@
 #define AUDIO_COLUMN_HH
 
 #include "proto.hh"
+#include "pcursor.hh"
 #include "plist.hh"
 #include "lily-proto.hh"
 #include "moment.hh"

diff --git a/lily/p-score.cc b/lily/p-score.cc
index 6b68f7f0fd97b1aa8096167ffabaadb8da9a124c..67ab711c4dd8d817a3992dd0517b60bf92babf7b 100644 (file)
--- a/lily/p-score.cc
+++ b/lily/p-score.cc
@@ -25,7 +25,8 @@
 #include "file-results.hh"
 #include "misc.hh"
 
-#if 0                          // has w32 advanced?
+//#if 0                                // has w32 advanced?
+#if 1                          // cygwin-b20: nope
 // sucking Cygnus egcs - w32
 #include "list.tcc"
 #include "cursor.tcc"