[Scummvm-git-logs] scummvm master -> a6df289fdd086a526c939890566efd68b15e5ced

[mduggan]

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:
a6df289fdd ICB: Remove more duplicate types


Commit: a6df289fdd086a526c939890566efd68b15e5ced
    https://github.com/scummvm/scummvm/commit/a6df289fdd086a526c939890566efd68b15e5ced
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-12-27T11:26:37+09:00

Commit Message:
ICB: Remove more duplicate types

Changed paths:
    engines/icb/gfx/psx_pcdefines.h


diff --git a/engines/icb/gfx/psx_pcdefines.h b/engines/icb/gfx/psx_pcdefines.h
index 9064f895c6..8606457494 100644
--- a/engines/icb/gfx/psx_pcdefines.h
+++ b/engines/icb/gfx/psx_pcdefines.h
@@ -28,6 +28,7 @@
 #ifndef ICB_PSX_PCDEFINES_H
 #define ICB_PSX_PCDEFINES_H
 
+#include "common/types.h"
 #include "engines/icb/common/px_rccommon.h"
 
 namespace ICB {
@@ -44,24 +45,6 @@ typedef unsigned short u_short;
 // a uint type
 typedef unsigned int u_int;
 
-// another uint type
-typedef unsigned int uint;
-
-// a uint32 type
-typedef unsigned int uint32;
-
-// a uint16 type
-typedef unsigned short uint16;
-
-// a int32 type
-typedef signed int int32;
-
-// a int16 type
-typedef short int16;
-
-// a uint8 type
-typedef unsigned char uint8;
-
 // make our own equivalents
 typedef struct MATRIX {
 	short m[3][3]; /* 3x3 rotation matrix */