[Scummvm-git-logs] scummvm master -> 9809e19f48f750c79068baf3a0681c6a0233a083

[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:
9809e19f48 GLK: Yet another Amiga compilation fix


Commit: 9809e19f48f750c79068baf3a0681c6a0233a083
    https://github.com/scummvm/scummvm/commit/9809e19f48f750c79068baf3a0681c6a0233a083
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-12-09T11:21:31-08:00

Commit Message:
GLK: Yet another Amiga compilation fix

Changed paths:
    engines/glk/streams.h
    engines/glk/window_text_buffer.h
    engines/glk/window_text_grid.h
    engines/glk/windows.h


diff --git a/engines/glk/streams.h b/engines/glk/streams.h
index 0b82b36..8d72c57 100644
--- a/engines/glk/streams.h
+++ b/engines/glk/streams.h
@@ -181,7 +181,7 @@ public:
 	/**
 	 * Write a unicode character
 	 */
-	virtual void putCharUni(uint32 ch) = 0;
+	virtual void putCharUni(glui32 ch) = 0;
 
 	/**
 	 * Write a buffer
@@ -191,7 +191,7 @@ public:
 	/**
 	 * Write a unicode character
 	 */
-	virtual void putBufferUni(const uint32 *buf, size_t len) = 0;
+	virtual void putBufferUni(const glui32 *buf, size_t len) = 0;
 
 	/**
 	 * Remove a string from the end of the stream, if indeed it is at the end
@@ -206,7 +206,7 @@ public:
 	/**
 	 * Send a line to the stream with a trailing newline
 	 */
-	void echoLine(char *buf, glui32 len) {
+	void echoLine(const char *buf, glui32 len) {
 		putBuffer(buf, len);
 		putChar('\n');
 	};
@@ -214,7 +214,7 @@ public:
 	/**
 	 * Send a line to the stream with a trailing newline
 	 */
-	void echoLineUni(glui32 *buf, glui32 len) {
+	void echoLineUni(const glui32 *buf, glui32 len) {
 		putBufferUni(buf, len);
 		putCharUni('\n');
 	}
@@ -327,7 +327,7 @@ public:
 	/**
 	 * Write a unicode character
 	 */
-	virtual void putCharUni(uint32 ch) override;
+	virtual void putCharUni(glui32 ch) override;
 
 	/**
 	 * Write a buffer
@@ -337,7 +337,7 @@ public:
 	/**
 	 * Write a unicode character
 	 */
-	virtual void putBufferUni(const uint32 *buf, size_t len) override;
+	virtual void putBufferUni(const glui32 *buf, size_t len) override;
 
 	/**
 	 * Remove a string from the end of the stream, if indeed it is at the end
@@ -391,7 +391,7 @@ public:
 	/**
 	 * Write a unicode character
 	 */
-	virtual void putCharUni(uint32 ch) override;
+	virtual void putCharUni(glui32 ch) override;
 
 	/**
 	 * Write a buffer
@@ -401,7 +401,7 @@ public:
 	/**
 	 * Write a unicode character
 	 */
-	virtual void putBufferUni(const uint32 *buf, size_t len) override;
+	virtual void putBufferUni(const glui32 *buf, size_t len) override;
 
 	virtual glui32 getPosition() const override;
 
@@ -493,7 +493,7 @@ public:
 	/**
 	 * Write a unicode character
 	 */
-	virtual void putCharUni(uint32 ch) override;
+	virtual void putCharUni(glui32 ch) override;
 
 	/**
 	 * Write a buffer
@@ -503,7 +503,7 @@ public:
 	/**
 	 * Write a unicode character
 	 */
-	virtual void putBufferUni(const uint32 *buf, size_t len) override;
+	virtual void putBufferUni(const glui32 *buf, size_t len) override;
 
 	virtual glui32 getPosition() const override;
 
diff --git a/engines/glk/window_text_buffer.h b/engines/glk/window_text_buffer.h
index 86b0319..b20d921 100644
--- a/engines/glk/window_text_buffer.h
+++ b/engines/glk/window_text_buffer.h
@@ -162,7 +162,7 @@ public:
 	/**
 	 * Write a unicode character
 	 */
-	virtual void putCharUni(uint32 ch) override;
+	virtual void putCharUni(glui32 ch) override;
 
 	/**
 	 * Unput a unicode character
diff --git a/engines/glk/window_text_grid.h b/engines/glk/window_text_grid.h
index d7830e0..ae8f2c9 100644
--- a/engines/glk/window_text_grid.h
+++ b/engines/glk/window_text_grid.h
@@ -100,7 +100,7 @@ public:
 	/**
 	 * Write a unicode character
 	 */
-	virtual void putCharUni(uint32 ch) override;
+	virtual void putCharUni(glui32 ch) override;
 
 	/**
 	 * Unput a unicode character
diff --git a/engines/glk/windows.h b/engines/glk/windows.h
index 4b71aa0..cb13095 100644
--- a/engines/glk/windows.h
+++ b/engines/glk/windows.h
@@ -430,7 +430,7 @@ public:
 	/**
 	 * Write a character
 	 */
-	virtual void putCharUni(uint32 ch) {}
+	virtual void putCharUni(glui32 ch) {}
 
 	/**
 	 * Unput a unicode character