aboutsummaryrefslogtreecommitdiff
path: root/engines/glk/tads/tads2/error.cpp
diff options
context:
space:
mode:
authordreammaster2019-05-22 05:48:52 +0100
committerPaul Gilbert2019-05-24 18:21:07 -0700
commitaa5fd603b6fd623c138fd3529176847b5b538e49 (patch)
tree1c9003a4ef67b73ae89c5fba0e6024969e710f03 /engines/glk/tads/tads2/error.cpp
parent0c02346b48e068dddff81bf4fde57040135deb51 (diff)
downloadscummvm-rg350-aa5fd603b6fd623c138fd3529176847b5b538e49.tar.gz
scummvm-rg350-aa5fd603b6fd623c138fd3529176847b5b538e49.tar.bz2
scummvm-rg350-aa5fd603b6fd623c138fd3529176847b5b538e49.zip
GLK: TADS2: Compilation fixes
Diffstat (limited to 'engines/glk/tads/tads2/error.cpp')
-rw-r--r--engines/glk/tads/tads2/error.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/glk/tads/tads2/error.cpp b/engines/glk/tads/tads2/error.cpp
index eeb59cda81..62c5e9a3e6 100644
--- a/engines/glk/tads/tads2/error.cpp
+++ b/engines/glk/tads/tads2/error.cpp
@@ -93,7 +93,7 @@ int errfmt(char *outbuf, int outbufl, const char *fmt, int argc, const erradef *
static struct
{
int tokid;
- char *toknam;
+ const char *toknam;
} toklist[] =
{
{ TOKTSEM, "semicolon" },
@@ -106,7 +106,7 @@ int errfmt(char *outbuf, int outbufl, const char *fmt, int argc, const erradef *
{ TOKTWHILE, "\"while\"" },
{ TOKTLPAR, "left paren ('(')" },
{ TOKTEQ, "'='" },
- { 0, (char *)0 }
+ { 0, (const char *)nullptr }
};
for (i = 0 ; toklist[i].toknam ; ++i)
@@ -185,7 +185,7 @@ void errsign(errcxdef *ctx, int e) {
}
/* enter a string argument */
-char *errstr(errcxdef *ctx, char *str, int len) {
+char *errstr(errcxdef *ctx, const char *str, int len) {
char *ret = &ctx->errcxbuf[ctx->errcxofs];
memcpy(ret, str, (size_t)len);