From 0a6f015a862747df716d310dd98df9a572a9dfbe Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 6 Jul 2019 17:24:37 -0700
Subject: GLK: ALAN3: Fix gcc errors

---
 engines/glk/alan3/inter.cpp |  4 ++--
 engines/glk/detection.cpp   | 12 ++++++------
 engines/glk/detection.h     |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'engines')

diff --git a/engines/glk/alan3/inter.cpp b/engines/glk/alan3/inter.cpp
index 5d70b393f2..471f6a907f 100644
--- a/engines/glk/alan3/inter.cpp
+++ b/engines/glk/alan3/inter.cpp
@@ -763,7 +763,7 @@ void interpret(CONTEXT, Aaddr adr) {
 			case I_SETSIZE: {
 				Set *set = (Set *)fromAptr(pop(stack));
 				if (traceInstructionOption)
-					printf("SETSIZE\t%7ld\t\t", (long)set);
+					printf("SETSIZE\t%7p\t\t", set);
 				push(stack, setSize(set));
 				if (traceInstructionOption)
 					traceIntegerTopValue();
@@ -773,7 +773,7 @@ void interpret(CONTEXT, Aaddr adr) {
 				Set *set = (Set *)fromAptr(pop(stack));
 				Aint index = pop(stack);
 				if (traceInstructionOption)
-					printf("SETMEMB\t%7ld, %7ld", (long)set, (long)index);
+					printf("SETMEMB\t%7p, %7ld", set, (long)index);
 				push(stack, getSetMember(set, index));
 				if (traceInstructionOption)
 					traceIntegerTopValue();
diff --git a/engines/glk/detection.cpp b/engines/glk/detection.cpp
index b19ecde62d..f7ba0a6dc7 100644
--- a/engines/glk/detection.cpp
+++ b/engines/glk/detection.cpp
@@ -56,21 +56,21 @@
 
 namespace Glk {
 
-GlkDetectedGame::GlkDetectedGame(const char *gameId, const char *gameDesc, const Common::String &filename) :
-		DetectedGame(gameId, gameDesc, Common::EN_ANY, Common::kPlatformUnknown) {
+GlkDetectedGame::GlkDetectedGame(const char *id, const char *desc, const Common::String &filename) :
+		DetectedGame(id, desc, Common::EN_ANY, Common::kPlatformUnknown) {
 	setGUIOptions(GUIO3(GUIO_NOSPEECH, GUIO_NOMUSIC, GUIO_NOSUBTITLES));
 	addExtraEntry("filename", filename);
 }
 
-GlkDetectedGame::GlkDetectedGame(const char *gameId, const char *gameDesc, const Common::String &filename,
-		Common::Language lang) : DetectedGame(gameId, gameDesc, lang, Common::kPlatformUnknown) {
+GlkDetectedGame::GlkDetectedGame(const char *id, const char *desc, const Common::String &filename,
+		Common::Language lang) : DetectedGame(id, desc, lang, Common::kPlatformUnknown) {
 	setGUIOptions(GUIO3(GUIO_NOSPEECH, GUIO_NOMUSIC, GUIO_NOSUBTITLES));
 	addExtraEntry("filename", filename);
 }
 
-GlkDetectedGame::GlkDetectedGame(const char *gameId, const char *gameDesc, const Common::String &filename,
+GlkDetectedGame::GlkDetectedGame(const char *id, const char *desc, const Common::String &filename,
 		const Common::String &md5, size_t filesize) :
-		DetectedGame(gameId, gameDesc, Common::UNK_LANG, Common::kPlatformUnknown) {
+		DetectedGame(id, desc, Common::UNK_LANG, Common::kPlatformUnknown) {
 	setGUIOptions(GUIO3(GUIO_NOSPEECH, GUIO_NOMUSIC, GUIO_NOSUBTITLES));
 	addExtraEntry("filename", filename);
 
diff --git a/engines/glk/detection.h b/engines/glk/detection.h
index 2e2047edeb..677519d8e5 100644
--- a/engines/glk/detection.h
+++ b/engines/glk/detection.h
@@ -107,10 +107,10 @@ struct GameDescriptor {
  */
 class GlkDetectedGame : public DetectedGame {
 public:
-	GlkDetectedGame(const char *gameId, const char *gameDesc, const Common::String &filename);
-	GlkDetectedGame(const char *gameId, const char *gameDesc, const Common::String &filename,
+	GlkDetectedGame(const char *id, const char *desc, const Common::String &filename);
+	GlkDetectedGame(const char *id, const char *desc, const Common::String &filename,
 		Common::Language lang);
-	GlkDetectedGame(const char *gameId, const char *gameDesc, const Common::String &filename,
+	GlkDetectedGame(const char *id, const char *desc, const Common::String &filename,
 		const Common::String &md5, size_t filesize);
 };
 
-- 
cgit v1.2.3