X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fflower-proto.hh;h=384d8b89c8fdc071b5acff7d4bdc45d0c5adb08e;hb=2558df9ea472e4c520dd5bbfd35241bce9c0c560;hp=cad9bff1f2cf1672bb55dbb56e84f310013f387b;hpb=bc1e5cfa4aef13a1b9bd2d251dd9cb25dbaf9d03;p=lilypond.git

diff --git a/flower/include/flower-proto.hh b/flower/include/flower-proto.hh
index cad9bff1f2..384d8b89c8 100644
--- a/flower/include/flower-proto.hh
+++ b/flower/include/flower-proto.hh
@@ -1,42 +1,34 @@
-
 /*
   fflower-proto.hh -- typenames in flowerlib
 
-  (c) 1996 Han-Wen Nienhuys
+  (c) 1996--2006 Han-Wen Nienhuys
 */
 
-#ifndef FPROTO_HH
-#define FPROTO_HH
+#ifndef FLOWER_PROTO_HH
+#define FLOWER_PROTO_HH
 
+char const *flower_version_str0 ();
 
-char const * flower_version_sz();
+typedef unsigned char Byte;
+struct String_convert;
 
-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 Dictionary_iter;
-template<class T> struct Dictionary;
-template<class T> struct Dictionary_iter;
-template<class T> struct Link_list;
-template<class T> struct Interval_t;
-template<class T> struct PQueue;
+#include "std-string.hh"
+using namespace std;
 
 #include "real.hh"
 
+template<class T> struct Interval_t;
+template<class T> struct PQueue;
+template<class T, class A> class Matrix;
+
 typedef Interval_t<Real> Interval;
-typedef Interval_t<int> Slice;	// junkme.
 
 struct Offset;
 struct Long_option_init;
 struct Rational;
-struct File_path;
+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;
@@ -50,7 +42,6 @@ typedef unsigned U32;
 typedef int I32;
 typedef long long I64;
 
-typedef unsigned char Byte;
 
 struct Duration;
 struct Duration_iterator;
@@ -61,7 +52,4 @@ struct File_storage;
 struct Mapped_file_storage;
 struct Simple_file_storage;
 
-
-
-#endif // FPROTO_HH
-
+#endif /* FLOWER_PROTO_HH */