Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / flower / include / flower-proto.hh

diff --git a/flower/include/flower-proto.hh b/flower/include/flower-proto.hh
index 24a050b16951d646b6964d9bdefddba284e303ff..0d82d8bbc797cb8b8146fdf7dc98beb9b1dd226b 100644 (file)
--- a/flower/include/flower-proto.hh
+++ b/flower/include/flower-proto.hh
@@ -1,4 +1,3 @@
-
 /*
   fflower-proto.hh -- typenames in flowerlib
 
@@ -10,16 +9,17 @@
 
 char const *flower_version_str0 ();
 
-template<class T> struct Link_array;
-template<class T> struct Array;
-template<class T, class K> struct Assoc;
-template<class K, class V> struct Hash_table;
-template<class K, class V> struct Hash_table_iter;
-template<class T> struct Link_list;
+typedef unsigned char Byte;
+struct String_convert;
+
+#include "std-string.hh"
+using namespace std;
+
+#include "real.hh"
+
 template<class T> struct Interval_t;
 template<class T> struct PQueue;
 
-#include "real.hh"
 
 typedef Interval_t<Real> Interval;
 
@@ -29,10 +29,6 @@ struct Rational;
 class File_name;
 class File_path;
 struct Getopt_long;
-struct String_data;
-struct String_handle;
-struct String_convert;
-struct String;
 
 struct Text_stream;
 struct Data_file;
@@ -46,7 +42,6 @@ typedef unsigned U32;
 typedef int I32;
 typedef long long I64;
 
-typedef unsigned char Byte;
 
 struct Duration;
 struct Duration_iterator;