From cdfb61dd99a4c75a0490605831d4f8a06a0dccbe Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 9 Dec 2018 11:04:51 -0800 Subject: GLK: Hopefully finally fix Amiga compilation --- engines/glk/frotz/glk_interface.cpp | 6 +++--- engines/glk/glk_types.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'engines') diff --git a/engines/glk/frotz/glk_interface.cpp b/engines/glk/frotz/glk_interface.cpp index 79907cbc84..7c8f490fce 100644 --- a/engines/glk/frotz/glk_interface.cpp +++ b/engines/glk/frotz/glk_interface.cpp @@ -49,7 +49,7 @@ GlkInterface::~GlkInterface() { } void GlkInterface::initialize() { - uint width, height; + glui32 width, height; /* * Init glk stuff @@ -425,7 +425,7 @@ void GlkInterface::packspaces(zchar *src, zchar *dst) { void GlkInterface::smartstatusline() { zchar packed[256]; - zchar buf[256]; + glui32 buf[256]; zchar *a, *b, *c, *d; int roomlen, scorelen, scoreofs; int len, tmp; @@ -478,7 +478,7 @@ void GlkInterface::gos_cancel_pending_line() { } void GlkInterface::showBeyondZorkTitle() { - uint winW, winH, imgW, imgH; + glui32 winW, winH, imgW, imgH; winid_t win = glk_window_open(0, 0, 0, wintype_Graphics, 0); glk_window_get_size(win, &winW, &winH); diff --git a/engines/glk/glk_types.h b/engines/glk/glk_types.h index 3c8f60f9d6..3a51b96887 100644 --- a/engines/glk/glk_types.h +++ b/engines/glk/glk_types.h @@ -28,8 +28,8 @@ namespace Glk { -typedef uint32 glui32; -typedef int32 glsi32; +typedef uint glui32; +typedef int glsi32; class Window; /** -- cgit v1.2.3