From 3dc4db374234544eca91dede1415969a8eb9efa5 Mon Sep 17 00:00:00 2001 From: dinoex Date: Mon, 9 Oct 2006 10:29:30 +0000 Subject: - fix build with gcc41 Obtained from: debian --- misc/estic/files/patch-itemwin.h | 11 +++++++++ misc/estic/files/patch-str.h | 49 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 misc/estic/files/patch-itemwin.h create mode 100644 misc/estic/files/patch-str.h (limited to 'misc') diff --git a/misc/estic/files/patch-itemwin.h b/misc/estic/files/patch-itemwin.h new file mode 100644 index 00000000000..f0ea83a8bbe --- /dev/null +++ b/misc/estic/files/patch-itemwin.h @@ -0,0 +1,11 @@ +--- estic-1.61.orig/spunk/itemwin.h ++++ spunk/itemwin.h +@@ -54,7 +54,7 @@ + /* class WindowItem */ + /*****************************************************************************/ + +- ++class ItemWindow; + + class WindowItem : public Streamable { + diff --git a/misc/estic/files/patch-str.h b/misc/estic/files/patch-str.h new file mode 100644 index 00000000000..8f43cc32e08 --- /dev/null +++ b/misc/estic/files/patch-str.h @@ -0,0 +1,49 @@ +--- estic-1.61.orig/spunk/str.h ++++ spunk/str.h +@@ -91,6 +91,46 @@ + // Note: This string class may not work with strings greater than INT_MAX or + // 0xFFFF, whichever is less + ++// Declare functions and operators which are later 'injected' as friends ++// (gcc-4.1 doesn't allow friend injection any more) ++ ++ String ShowControls (const String& S, unsigned Style); ++ String HideControls (const String& S); ++ String& operator += (String&, const char); ++ String& operator += (String&, const char*); ++ inline String& operator += (String&, const String&); ++ String operator + (const String&, const char); ++ String operator + (const String&, const char*); ++ String operator + (const String&, const String&); ++ String operator + (const char, const String&); ++ String operator + (const char*, const String&); ++ inline int operator == (const String&, const String&); ++ inline int operator != (const String&, const String&); ++ inline int operator >= (const String&, const String&); ++ inline int operator <= (const String&, const String&); ++ inline int operator > (const String&, const String&); ++ inline int operator < (const String&, const String&); ++ inline int operator == (const char*, const String&); ++ inline int operator != (const char*, const String&); ++ inline int operator >= (const char*, const String&); ++ inline int operator <= (const char*, const String&); ++ inline int operator > (const char*, const String&); ++ inline int operator < (const char*, const String&); ++ inline int operator == (const String&, const char*); ++ inline int operator != (const String&, const char*); ++ inline int operator >= (const String&, const char*); ++ inline int operator <= (const String&, const char*); ++ inline int operator > (const String&, const char*); ++ inline int operator < (const String&, const char*); ++ ++ inline int Compare (const String& S1, const String& S2); ++ ++ int Match (const char* Source, const char* Pattern); ++ int Match (const String& Source, const String& Pattern); ++ int Match (const String& Source, const char* Pattern); ++ int Match (const char* Source, const String& Pattern); ++ ++ String FormatStr (const char* S, ...); + + class String : public Streamable { + -- cgit