aboutsummaryrefslogtreecommitdiff
path: root/engines/glk/time.h
diff options
context:
space:
mode:
authorPaul Gilbert2018-12-09 11:36:20 -0800
committerPaul Gilbert2018-12-09 11:36:20 -0800
commit7637edb5a2e84c0abbf1c1aa156772ce1f7906c3 (patch)
tree4c35ef8cf96ffd4148a19dafaf082a0209d0416a /engines/glk/time.h
parent9809e19f48f750c79068baf3a0681c6a0233a083 (diff)
downloadscummvm-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/time.h')
-rw-r--r--engines/glk/time.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/glk/time.h b/engines/glk/time.h
index 8e68328dcf..6bf3f37b16 100644
--- a/engines/glk/time.h
+++ b/engines/glk/time.h
@@ -30,21 +30,21 @@ namespace Glk {
typedef int64 TimeSeconds;
struct Timestamp {
- glsi32 high_sec;
- glui32 low_sec;
- glsi32 microsec;
+ int high_sec;
+ uint low_sec;
+ int microsec;
};
typedef Timestamp glktimeval_t;
struct TimeAndDate {
- glsi32 year; ///< full (four-digit) year
- glsi32 month; ///< 1-12, 1 is January
- glsi32 day; ///< 1-31
- glsi32 weekday; ///< 0-6, 0 is Sunday
- glsi32 hour; ///< 0-23
- glsi32 minute; ///< 0-59
- glsi32 second; ///< 0-59, maybe 60 during a leap second
- glsi32 microsec; ///< 0-999999
+ int year; ///< full (four-digit) year
+ int month; ///< 1-12, 1 is January
+ int day; ///< 1-31
+ int weekday; ///< 0-6, 0 is Sunday
+ int hour; ///< 0-23
+ int minute; ///< 0-59
+ int second; ///< 0-59, maybe 60 during a leap second
+ int microsec; ///< 0-999999
private:
/**
* Get the number of seconds since the start of 1970