[Scummvm-git-logs] scummvm master -> cfe8f4889c340790f60ef5dfdaa85f3e30241ccf

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cfe8f4889c GLK: Fix unused variable warnings


Commit: cfe8f4889c340790f60ef5dfdaa85f3e30241ccf
    https://github.com/scummvm/scummvm/commit/cfe8f4889c340790f60ef5dfdaa85f3e30241ccf
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-03-15T18:54:58-07:00

Commit Message:
GLK: Fix unused variable warnings

Reported by Clang.

Changed paths:
    engines/glk/level9/os_glk.cpp
    engines/glk/magnetic/glk.cpp


diff --git a/engines/glk/level9/os_glk.cpp b/engines/glk/level9/os_glk.cpp
index f29457d85f..c94216ad96 100644
--- a/engines/glk/level9/os_glk.cpp
+++ b/engines/glk/level9/os_glk.cpp
@@ -292,6 +292,7 @@ struct gln_rgb_t {
 };
 typedef gln_rgb_t *gln_rgbref_t;
 
+#ifndef GARGLK
 /*
  * Maximum number of regions to consider in a single repaint pass.  A
  * couple of hundred seems to strike the right balance between not too
@@ -299,6 +300,7 @@ typedef gln_rgb_t *gln_rgbref_t;
  * rendering, when combined with short timeouts.
  */
 static const int GLN_REPAINT_LIMIT = 256;
+#endif
 
 /*
  * Graphics timeout; we like an update call after this period (ms).  In
diff --git a/engines/glk/magnetic/glk.cpp b/engines/glk/magnetic/glk.cpp
index 37cbc5c3ed..fd7d06f55d 100644
--- a/engines/glk/magnetic/glk.cpp
+++ b/engines/glk/magnetic/glk.cpp
@@ -97,12 +97,7 @@ static gms_abbreviation_t GMS_ABBREVIATIONS[] = {
 /*  Module constants                                                   */
 /*---------------------------------------------------------------------*/
 
-/* Glk Magnetic Scrolls port version number. */
-static const glui32 GMS_PORT_VERSION = 0x00010601;
-
-/* Magnetic Scrolls standard input prompt string. */
-static const char *const GMS_INPUT_PROMPT = ">";
-
+#ifndef GARGLK
 /*
  * Maximum number of regions to consider in a single repaint pass.  A
  * couple of hundred seems to strike the right balance between not too
@@ -110,6 +105,7 @@ static const char *const GMS_INPUT_PROMPT = ">";
  * rendering, when combined with short timeouts.
  */
 static const int GMS_REPAINT_LIMIT = 256;
+#endif
 
 /*
  * Graphics timeout; we like an update call after this period (ms).  In
@@ -170,8 +166,8 @@ static const int GMS_GRAPHICS_UNUSED_PIXEL = 0xff;
 static const int GMS_DEFAULT_STATUS_WIDTH = 74;
 
 /* Success and fail return codes from hint functions. */
-static const type8 GMS_HINT_SUCCESS = 1,
-GMS_HINT_ERROR = 0;
+static const type8 GMS_HINT_SUCCESS = 1;
+// static const type8 GMS_HINT_ERROR = 0;
 
 /* Default window sizes for non-windowing Glk libraries. */
 static const glui32 GMS_HINT_DEFAULT_WIDTH = 72,