From 4ede54e6b0f76201937fc90387f3579fbb546719 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Tue, 17 Jan 2017 20:28:12 +0100
Subject: GRAPHICS: Rename MacFont to MacFONTFont to avoid clashed

---
 common/macresman.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'common')

diff --git a/common/macresman.h b/common/macresman.h
index 05b2a875f4..1be825b7b4 100644
--- a/common/macresman.h
+++ b/common/macresman.h
@@ -176,6 +176,11 @@ public:
 	 */
 	MacResTagArray getResTagArray();
 
+	/**
+	 * Load from stream in MacBinary format
+	 */
+	bool loadFromMacBinary(SeekableReadStream &stream);
+
 private:
 	SeekableReadStream *_stream;
 	String _baseFileName;
@@ -183,7 +188,6 @@ private:
 	bool load(SeekableReadStream &stream);
 
 	bool loadFromRawFork(SeekableReadStream &stream);
-	bool loadFromMacBinary(SeekableReadStream &stream);
 	bool loadFromAppleDouble(SeekableReadStream &stream);
 
 	static String constructAppleDoubleName(String name);
-- 
cgit v1.2.3