X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fflower-proto.hh;h=34e56961a11f874029b02fb202419364b092182c;hb=a9d9433bc7b95cb2d4b3d96eefce7a8437c0d44e;hp=cb8cb71bae8c61c01b25db395e91ba8ecf33a790;hpb=3e7b0379a6d0e741be2049e2947a2f8af07b5005;p=lilypond.git diff --git a/flower/include/flower-proto.hh b/flower/include/flower-proto.hh index cb8cb71bae..34e56961a1 100644 --- a/flower/include/flower-proto.hh +++ b/flower/include/flower-proto.hh @@ -1,7 +1,7 @@ /* - fflower-proto.hh -- typenames in flowerlib + flower-proto.hh -- typenames in flowerlib - (c) 1996--2006 Han-Wen Nienhuys + (c) 1996--2009 Han-Wen Nienhuys */ #ifndef FLOWER_PROTO_HH @@ -10,17 +10,17 @@ char const *flower_version_str0 (); typedef unsigned char Byte; +typedef long long I64; struct String_convert; #include "std-string.hh" -#include "std-vector.hh" using namespace std; #include "real.hh" template struct Interval_t; template struct PQueue; - +template class Matrix; typedef Interval_t Interval; @@ -31,24 +31,18 @@ class File_name; class File_path; struct Getopt_long; -struct Text_stream; -struct Data_file; -struct Text_db; -struct Scalar; - 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; +/* 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;