[Scummvm-git-logs] scummvm master -> 3fa3967cff99457bbb9f18c36284af78f3ef5678

[criezy]

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:
3fa3967cff GLK: Attemp to fix multiple definitions link errors


Commit: 3fa3967cff99457bbb9f18c36284af78f3ef5678
    https://github.com/scummvm/scummvm/commit/3fa3967cff99457bbb9f18c36284af78f3ef5678
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2018-12-28T22:21:01+01:00

Commit Message:
GLK: Attemp to fix multiple definitions link errors

Changed paths:
    engines/glk/alan2/util.h


diff --git a/engines/glk/alan2/util.h b/engines/glk/alan2/util.h
index a9cd26f..702cdf1 100644
--- a/engines/glk/alan2/util.h
+++ b/engines/glk/alan2/util.h
@@ -37,47 +37,47 @@ extern ActElem *acts;	// Actor table pointer
 extern ObjElem *objs;	// Object table pointer
 
 // Type checks 
-bool isObj(Aword x) {
+inline bool isObj(Aword x) {
 	return x >= OBJMIN && x <= OBJMAX;
 }
 
-bool isAct(Aword x) {
+inline bool isAct(Aword x) {
 	return x >= ACTMIN && x <= ACTMAX;
 }
 
-bool isCnt(Aword x) {
+inline bool isCnt(Aword x) {
 	return (x >= CNTMIN && x <= CNTMAX) ||
 		(isObj(x) && objs[x - OBJMIN].cont != 0) ||
 		(isAct(x) && acts[x - ACTMIN].cont != 0);
 }
 
-bool isLoc(Aword x) {
+inline bool isLoc(Aword x) {
 	return x >= LOCMIN && x <= LOCMAX;
 }
 
-bool isNum(Aword x) {
+inline bool isNum(Aword x) {
 	return x >= LITMIN && x <= LITMAX && litValues[x - LITMIN].type == TYPNUM;
 }
 
-bool isStr(Aword x) {
+inline bool isStr(Aword x) {
 	return x >= LITMIN && x <= LITMAX && litValues[x - LITMIN].type == TYPSTR;
 }
 
-bool isLit(Aword x) {
+inline bool isLit(Aword x) {
 	return x >= LITMIN && x <= LITMAX;
 }
 
-bool endOfTable(LimElem *addr) {
+inline bool endOfTable(LimElem *addr) {
 	Aword *x = (Aword *)addr;
 	return *x == EOF;
 }
 
-bool endOfTable(ScrElem *addr) {
+inline bool endOfTable(ScrElem *addr) {
 	Aword *x = (Aword *)addr;
 	return *x == EOF;
 }
 
-bool endOfTable(ExtElem *addr) {
+inline bool endOfTable(ExtElem *addr) {
 	Aword *x = (Aword *)addr;
 	return *x == EOF;
 }