GLK: Fix various gcc warnings

2 files changed, 8 insertions, 7 deletions

diff --git a/engines/glk/glulxe/glulxe.h b/engines/glk/glulxe/glulxe.h
index 02c8ab9b32..150decd748 100644
--- a/engines/glk/glulxe/glulxe.h
+++ b/engines/glk/glulxe/glulxe.h
@@ -432,12 +432,6 @@ public:
 	 * Display a warning in the error window, and then continue.
 	 */
 	void nonfatal_warning_handler(const char *str, const char *arg, bool useVal, int val);
-#define fatal_error(s)  (fatal_error_handler((s), nullptr, false, 0))
-#define fatal_error_2(s1, s2)  (fatal_error_handler((s1), (s2), false, 0))
-#define fatal_error_i(s, v)  (fatal_error_handler((s), nullptr, true, (v)))
-#define nonfatal_warning(s) (nonfatal_warning_handler((s), nullptr, false, 0))
-#define nonfatal_warning_2(s1, s2) (nonfatal_warning_handler((s1), (s2), false, 0))
-#define nonfatal_warning_i(s, v) (nonfatal_warning_handler((s), nullptr, true, (v)))
 
 	/**
 	 * \defgroup Files access methods
@@ -988,6 +982,13 @@ public:
 
 extern Glulxe *g_vm;
 
+#define fatal_error(s)  (fatal_error_handler((s), nullptr, false, 0))
+#define fatal_error_2(s1, s2)  (fatal_error_handler((s1), (s2), false, 0))
+#define fatal_error_i(s, v)  (fatal_error_handler((s), nullptr, true, (v)))
+#define nonfatal_warning(s) (nonfatal_warning_handler((s), nullptr, false, 0))
+#define nonfatal_warning_2(s1, s2) (nonfatal_warning_handler((s1), (s2), false, 0))
+#define nonfatal_warning_i(s, v) (nonfatal_warning_handler((s), nullptr, true, (v)))
+
 } // End of namespace Glulxe
 } // End of namespace Glk
 
diff --git a/engines/glk/glulxe/string.cpp b/engines/glk/glulxe/string.cpp
index 4a3229bef0..df7e505c3c 100644
--- a/engines/glk/glulxe/string.cpp
+++ b/engines/glk/glulxe/string.cpp
@@ -49,7 +49,7 @@ void Glulxe::stream_set_iosys(uint mode, uint rock) {
 	switch (mode) {
 	default:
 		mode = 0;
-	/* ...and fall through to next case (no-op I/O). */
+		// fall through
 	case iosys_None:
 		rock = 0;
 		stream_char_handler = &Glulxe::nopio_char_han;