aboutsummaryrefslogtreecommitdiff
path: root/engines/glk/tads
diff options
context:
space:
mode:
authorPaul Gilbert2019-07-24 20:32:14 -0700
committerPaul Gilbert2019-07-24 20:32:14 -0700
commit58498cf5f21375c3ab89a8486175ff8de087bdf7 (patch)
tree62f72f4033f6369ae492131d3c5b52e2e6620d90 /engines/glk/tads
parenta1414f9ad6739cd411ca79ad77359ae4858d1379 (diff)
downloadscummvm-rg350-58498cf5f21375c3ab89a8486175ff8de087bdf7.tar.gz
scummvm-rg350-58498cf5f21375c3ab89a8486175ff8de087bdf7.tar.bz2
scummvm-rg350-58498cf5f21375c3ab89a8486175ff8de087bdf7.zip
GLK: Fixing some gcc 8 warnings
Diffstat (limited to 'engines/glk/tads')
-rw-r--r--engines/glk/tads/tads2/memory_cache.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/glk/tads/tads2/memory_cache.cpp b/engines/glk/tads/tads2/memory_cache.cpp
index 359f1b3a4c..d6f2e3cbcc 100644
--- a/engines/glk/tads/tads2/memory_cache.cpp
+++ b/engines/glk/tads/tads2/memory_cache.cpp
@@ -807,9 +807,7 @@ static uchar *mcmhalo(mcmcx1def *ctx)
{
uchar *chunk;
int err;
-# define size (MCMCHUNK + sizeof(mcmhdef) + 2*osrndsz(sizeof(mcmon)))
-
- VARUSED(err);
+#define size (MCMCHUNK + sizeof(mcmhdef) + 2*osrndsz(sizeof(mcmon)))
MCMGLBCTX(ctx);
@@ -829,9 +827,11 @@ static uchar *mcmhalo(mcmcx1def *ctx)
ctx->mcmcxhpch = (mcmhdef *)chunk;
/*@@@@*/
*(mcmon *)(chunk + osrndsz(sizeof(mcmhdef) + MCMCHUNK)) = MCMONINV;
- return(chunk + sizeof(mcmhdef));
+ VARUSED(err);
+
+ return(chunk + sizeof(mcmhdef));
-# undef size
+#undef size
}
/* "use" an object - move to most-recent position in LRU chain */