X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fflower-proto.hh;h=ded0f6da411451a2b1ccb1d62cd4de49912ac3ca;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=c654c96dc75ceb989b906aa47251cb5850ac8aa0;hpb=33dc014ec7a5445fd4e70aeefc8e36421acf435c;p=lilypond.git

diff --git a/flower/include/flower-proto.hh b/flower/include/flower-proto.hh
index c654c96dc7..ded0f6da41 100644
--- a/flower/include/flower-proto.hh
+++ b/flower/include/flower-proto.hh
@@ -1,64 +1,63 @@
-
 /*
-  fflower-proto.hh -- typenames in flowerlib
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1996--2015 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.
 
-  (c)  1996--2003 Han-Wen Nienhuys
+  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.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef FPROTO_HH
-#define FPROTO_HH
+#ifndef FLOWER_PROTO_HH
+#define FLOWER_PROTO_HH
 
+char const *flower_version_str0 ();
 
-char const * flower_version_str0 ();
+typedef unsigned char Byte;
+typedef long long I64;
+class 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 Link_list;
-template<class T> struct Interval_t;
-template<class T> struct PQueue;
+#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;
-typedef Interval_t<int> Slice;	// junkme.
 
-struct Offset;
+class Offset;
 struct Long_option_init;
-struct Rational;
-struct 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 Rational;
+class File_name;
+class File_path;
+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;
 
-
-
-#endif // FPROTO_HH
-
+#endif /* FLOWER_PROTO_HH */