From 09f24e46b307f3eb248a9d2732862325328c1521 Mon Sep 17 00:00:00 2001 From: Davide Beatrici Date: Sat, 15 Aug 2020 03:55:37 +0200 Subject: [PATCH] Remove "WORD", use "USHORT" everywhere for consistency --- src/Mayaqua/Kernel.c | 2 +- src/Mayaqua/MayaType.h | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/Mayaqua/Kernel.c b/src/Mayaqua/Kernel.c index d5f3ce6f..78d69a49 100644 --- a/src/Mayaqua/Kernel.c +++ b/src/Mayaqua/Kernel.c @@ -1903,7 +1903,7 @@ void UINT64ToSystem(SYSTEMTIME *st, UINT64 sec64) sec = (UINT)tmp64; time = (time_64t)sec; TimeToSystem(st, time); - st->wMilliseconds = (WORD)millisec; + st->wMilliseconds = (USHORT)millisec; } // Convert the SYSTEMTIME to UINT64 diff --git a/src/Mayaqua/MayaType.h b/src/Mayaqua/MayaType.h index 118bcb17..398cb336 100644 --- a/src/Mayaqua/MayaType.h +++ b/src/Mayaqua/MayaType.h @@ -185,7 +185,6 @@ typedef signed int INT; #endif // 16bit integer type -typedef unsigned short WORD; typedef unsigned short USHORT; // 8bit integer type @@ -287,14 +286,14 @@ typedef struct OS_INFO #ifndef WINDOWS_H typedef struct SYSTEMTIME { - WORD wYear; - WORD wMonth; - WORD wDayOfWeek; - WORD wDay; - WORD wHour; - WORD wMinute; - WORD wSecond; - WORD wMilliseconds; + USHORT wYear; + USHORT wMonth; + USHORT wDayOfWeek; + USHORT wDay; + USHORT wHour; + USHORT wMinute; + USHORT wSecond; + USHORT wMilliseconds; } SYSTEMTIME; #endif // WINDOWS_H