aboutsummaryrefslogtreecommitdiff
path: root/engines/glk/magnetic/magnetic.h
diff options
context:
space:
mode:
authorD G Turner2019-11-23 12:38:11 +0000
committerD G Turner2019-11-23 12:38:11 +0000
commit84398f85d8cad3ee2805cfdc6f5563aa4c7748d6 (patch)
tree82d6eb08fd2fbd38bcc9957228ebcf4a4b06143c /engines/glk/magnetic/magnetic.h
parent09b33cdc86f9231eb4cb7c828986e45dbf675ced (diff)
downloadscummvm-rg350-84398f85d8cad3ee2805cfdc6f5563aa4c7748d6.tar.gz
scummvm-rg350-84398f85d8cad3ee2805cfdc6f5563aa4c7748d6.tar.bz2
scummvm-rg350-84398f85d8cad3ee2805cfdc6f5563aa4c7748d6.zip
GLK: MAGNETIC: Fix Compilation on AmigaOS4
This seems to be an issue where the initializer for the members called log get confused for a call to the log() standard library function. Renaming these members with leading underscores and adding some checks for nullptr before usage are good practice in any case and should fix this.
Diffstat (limited to 'engines/glk/magnetic/magnetic.h')
-rw-r--r--engines/glk/magnetic/magnetic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/glk/magnetic/magnetic.h b/engines/glk/magnetic/magnetic.h
index a3ea9ceee4..c19ef9c8b5 100644
--- a/engines/glk/magnetic/magnetic.h
+++ b/engines/glk/magnetic/magnetic.h
@@ -259,7 +259,7 @@ private:
size_t _saveSize;
private:
type8 buffer[80], xpos, bufpos, log_on, ms_gfx_enabled, filename[256];
- Common::DumpFile *log1, *log2;
+ Common::DumpFile *_log1, *_log2;
private:
/* Method local statics in original code */
glui32 crc_table[BYTE_MAX_VAL + 1];