[Scummvm-git-logs] scummvm master -> 7177836dcc8e719670186b6a9b0f651adf941d60

[dreammaster]

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:
7177836dcc GLK: TADS2: Amiga compilation fix


Commit: 7177836dcc8e719670186b6a9b0f651adf941d60
    https://github.com/scummvm/scummvm/commit/7177836dcc8e719670186b6a9b0f651adf941d60
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2019-05-25T10:10:36-07:00

Commit Message:
GLK: TADS2: Amiga compilation fix

Changed paths:
    engines/glk/tads/os_buffer.cpp
    engines/glk/tads/os_parse.cpp


diff --git a/engines/glk/tads/os_buffer.cpp b/engines/glk/tads/os_buffer.cpp
index 539a379..cb6ae90 100644
--- a/engines/glk/tads/os_buffer.cpp
+++ b/engines/glk/tads/os_buffer.cpp
@@ -52,7 +52,7 @@ static uint32 *input = 0;
 static uint max = 0;
 
 void os_put_buffer(const char *buf, size_t len) {
-    uint *out;
+    uint32 *out;
     uint outlen;
 
     if (!len)
diff --git a/engines/glk/tads/os_parse.cpp b/engines/glk/tads/os_parse.cpp
index d722d14..267103a 100644
--- a/engines/glk/tads/os_parse.cpp
+++ b/engines/glk/tads/os_parse.cpp
@@ -364,7 +364,7 @@ uint parse_cp1251(const unsigned char *buf, uint buflen, uint32 *out, uint outle
     return outpos;
 }
 
-uint prepare_cp1251(const uint *buf, uint buflen,
+static uint prepare_cp1251(const uint32 *buf, uint buflen,
                       unsigned char *out, uint outlen)
 {
     uint pos = 0;
@@ -572,7 +572,7 @@ uint parse_cp1252(const unsigned char *buf, uint buflen, uint32 *out, uint outle
     return outpos;
 }
 
-uint prepare_cp1252(const uint *buf, uint buflen,
+static uint prepare_cp1252(const uint32 *buf, uint buflen,
                       unsigned char *out, uint outlen)
 {
     uint pos = 0;
@@ -776,7 +776,7 @@ uint parse_mac(const unsigned char *buf, uint buflen, uint32 *out, uint outlen)
     return outpos;
 }
 
-uint prepare_mac(const uint *buf, uint buflen, unsigned char *out, uint outlen) {
+static uint prepare_mac(const uint32 *buf, uint buflen, unsigned char *out, uint outlen) {
     uint pos = 0;
     uint outpos = 0;
     uint res;