From 787a62c62d3a5864f0d221ca9acf12b8b332239b Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Fri, 28 Dec 2018 22:37:30 +0100 Subject: GLK: Fix multiple definitions of litCount variable --- engines/glk/alan2/parse.cpp | 2 ++ engines/glk/alan2/util.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/engines/glk/alan2/parse.cpp b/engines/glk/alan2/parse.cpp index 216f4746c7..7cb34c1c8c 100644 --- a/engines/glk/alan2/parse.cpp +++ b/engines/glk/alan2/parse.cpp @@ -33,6 +33,8 @@ namespace Glk { namespace Alan2 { + +uint32 litCount = 0; // All procedures for getting a command and turning it into a list of // dictionary entries are placed here. diff --git a/engines/glk/alan2/util.h b/engines/glk/alan2/util.h index 702cdf1f71..73d65e2b30 100644 --- a/engines/glk/alan2/util.h +++ b/engines/glk/alan2/util.h @@ -32,7 +32,7 @@ namespace Alan2 { // TODO: Move these extern LitElem *litValues; -uint32 litCount = 0; // for LITMAX +extern uint32 litCount; // for LITMAX - defined in parse.cpp extern ActElem *acts; // Actor table pointer extern ObjElem *objs; // Object table pointer -- cgit v1.2.3