X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fflower-proto.hh;h=59613cc2799c2c65f7101e1a035d63d70706cf08;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=0d36f06e79e9b2ad72a4b8dbcf7f00a1b3429d2c;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git
diff --git a/flower/include/flower-proto.hh b/flower/include/flower-proto.hh
index 0d36f06e79..59613cc279 100644
--- a/flower/include/flower-proto.hh
+++ b/flower/include/flower-proto.hh
@@ -1,67 +1,63 @@
-
/*
- 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.
- (c) 1996 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 .
*/
-#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 struct Link_array;
-template struct Array;
-template struct Assoc;
-template struct Hash_table;
-template struct Hash_table_iter;
-template struct Dictionary_iter;
-template struct Dictionary;
-template struct Dictionary_iter;
-template struct Link_list;
-template struct Interval_t;
-template struct PQueue;
+#include "std-string.hh"
#include "real.hh"
+using namespace std;
+
+template struct Interval_t;
+template struct PQueue;
+template class Matrix;
typedef Interval_t Interval;
-typedef Interval_t 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 */