X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fflower-proto.hh;h=59613cc2799c2c65f7101e1a035d63d70706cf08;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=24a050b16951d646b6964d9bdefddba284e303ff;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/flower/include/flower-proto.hh b/flower/include/flower-proto.hh
index 24a050b169..59613cc279 100644
--- a/flower/include/flower-proto.hh
+++ b/flower/include/flower-proto.hh
@@ -1,8 +1,20 @@
-
 /*
-  fflower-proto.hh -- typenames in flowerlib
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1996--2014 Han-Wen Nienhuys
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-  (c) 1996--2006 Han-Wen Nienhuys
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef FLOWER_PROTO_HH
@@ -10,49 +22,40 @@
 
 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;
-template<class T> struct Interval_t;
-template<class T> struct PQueue;
+typedef unsigned char Byte;
+typedef long long I64;
+class String_convert;
+
+#include "std-string.hh"
 
 #include "real.hh"
+using namespace std;
+
+template<class T> struct Interval_t;
+template<class T> struct PQueue;
+template<class T, class A> class Matrix;
 
 typedef Interval_t<Real> Interval;
 
-struct Offset;
+class Offset;
 struct Long_option_init;
-struct Rational;
+class 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;
-struct Text_db;
-struct Scalar;
+class Getopt_long;
 
 typedef unsigned char U8;
 typedef short I16;
 typedef unsigned short U16;
 typedef unsigned U32;
 typedef int I32;
-typedef long long I64;
+typedef unsigned long long U64;
 
-typedef unsigned char Byte;
+/* We should really use LLONG_MAX; unfortunately, this appears not to
+   be defined for the gub x-compiler.
+*/
+const U64 U64_MAX = (~0ULL);
 
-struct Duration;
-struct Duration_iterator;
-struct Source_file;
-struct Binary_source_file;
-struct Sources;
 struct File_storage;
 struct Mapped_file_storage;
 struct Simple_file_storage;