diff options
| author | Paul Gilbert | 2018-12-09 11:36:20 -0800 |
|---|---|---|
| committer | Paul Gilbert | 2018-12-09 11:36:20 -0800 |
| commit | 7637edb5a2e84c0abbf1c1aa156772ce1f7906c3 (patch) | |
| tree | 4c35ef8cf96ffd4148a19dafaf082a0209d0416a /engines/glk/unicode_gen.h | |
| parent | 9809e19f48f750c79068baf3a0681c6a0233a083 (diff) | |
| download | scummvm-rg350-7637edb5a2e84c0abbf1c1aa156772ce1f7906c3.tar.gz scummvm-rg350-7637edb5a2e84c0abbf1c1aa156772ce1f7906c3.tar.bz2 scummvm-rg350-7637edb5a2e84c0abbf1c1aa156772ce1f7906c3.zip | |
GLK: Change all references to glui32 and glsi32 to uint and int
This should finally fix compilation for the Amiga, which had
difference sized types. And the renamed types are clearer for
ScummVM anyway
Diffstat (limited to 'engines/glk/unicode_gen.h')
| -rw-r--r-- | engines/glk/unicode_gen.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/glk/unicode_gen.h b/engines/glk/unicode_gen.h index 6822d699f4..69e6aa000d 100644 --- a/engines/glk/unicode_gen.h +++ b/engines/glk/unicode_gen.h @@ -28,7 +28,7 @@ namespace Glk { #define GET_CASE_BLOCK(ch, blockptr) \ - switch ((glui32)(ch) >> 8) { \ + switch ((uint)(ch) >> 8) { \ case 0x0: \ *blockptr = unigen_case_block_0x0; \ break; \ @@ -423,9 +423,9 @@ namespace Glk { *specptr = nullptr; \ } -typedef glui32 gli_case_block_t[2]; ///< upper, lower -typedef glui32 gli_case_special_t[3]; ///< upper, lower, title -typedef glui32 gli_decomp_block_t[2]; ///< count, position +typedef uint gli_case_block_t[2]; ///< upper, lower +typedef uint gli_case_special_t[3]; ///< upper, lower, title +typedef uint gli_decomp_block_t[2]; ///< count, position extern gli_case_block_t unigen_case_block_0x0[256]; extern gli_case_block_t unigen_case_block_0x1[256]; @@ -556,7 +556,7 @@ extern gli_case_special_t unigen_special_0xfb14; extern gli_case_special_t unigen_special_0xfb15; extern gli_case_special_t unigen_special_0xfb16; extern gli_case_special_t unigen_special_0xfb17; -extern glui32 unigen_special_array[]; +extern uint unigen_special_array[]; } // End of namespace Glk |