Remove FX_WORD in favor of uint16_t.

xfa/fgas/localization/fgas_datetime.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/include/fxcrt/fx_system.h"
 #include "xfa/fgas/localization/fgas_datetime.h"
 
 #if _FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_ || \
@@ skipping 106 matching lines @@
     if (iDays < iMonthDays) {
       break;
     }
     iMonth++;
     iDays -= iMonthDays;
   }
   iDay += (uint8_t)iDays;
 }
 
 struct FXUT_SYSTEMTIME {
-  FX_WORD wYear;
-  FX_WORD wMonth;
-  FX_WORD wDayOfWeek;
-  FX_WORD wDay;
-  FX_WORD wHour;
-  FX_WORD wMinute;
-  FX_WORD wSecond;
-  FX_WORD wMilliseconds;
+  uint16_t wYear;
+  uint16_t wMonth;
+  uint16_t wDayOfWeek;
+  uint16_t wDay;
+  uint16_t wHour;
+  uint16_t wMinute;
+  uint16_t wSecond;
+  uint16_t wMilliseconds;
 };
 
 void CFX_Unitime::Now() {
   FXUT_SYSTEMTIME utLocal;
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \
     _FX_OS_ == _FX_WIN64_
   ::GetLocalTime((LPSYSTEMTIME)&utLocal);
 #elif _FX_OS_ != _FX_EMBEDDED_
 #if 1
   timeval curTime;
   gettimeofday(&curTime, NULL);
 #else
   struct timespec curTime;
   clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &curTime);
 #endif
   struct tm st;
   localtime_r(&curTime.tv_sec, &st);
   utLocal.wYear = st.tm_year + 1900;
   utLocal.wMonth = st.tm_mon + 1;
   utLocal.wDayOfWeek = st.tm_wday;
   utLocal.wDay = st.tm_mday;
   utLocal.wHour = st.tm_hour;
   utLocal.wMinute = st.tm_min;
   utLocal.wSecond = st.tm_sec;
   utLocal.wMilliseconds = curTime.tv_usec / 1000;
 #endif
   Set(utLocal.wYear, (uint8_t)utLocal.wMonth, (uint8_t)utLocal.wDay,
       (uint8_t)utLocal.wHour, (uint8_t)utLocal.wMinute,
-      (uint8_t)utLocal.wSecond, (FX_WORD)utLocal.wMilliseconds);
+      (uint8_t)utLocal.wSecond, (uint16_t)utLocal.wMilliseconds);
 }
 void CFX_Unitime::SetGMTime() {
   FXUT_SYSTEMTIME utLocal;
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \
     _FX_OS_ == _FX_WIN64_
   ::GetSystemTime((LPSYSTEMTIME)&utLocal);
 #elif _FX_OS_ != _FX_EMBEDDED_
 #if 1
   timeval curTime;
   gettimeofday(&curTime, NULL);
 #else
   struct timespec curTime;
   clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &curTime);
 #endif
   struct tm st;
   gmtime_r(&curTime.tv_sec, &st);
   utLocal.wYear = st.tm_year + 1900;
   utLocal.wMonth = st.tm_mon + 1;
   utLocal.wDayOfWeek = st.tm_wday;
   utLocal.wDay = st.tm_mday;
   utLocal.wHour = st.tm_hour;
   utLocal.wMinute = st.tm_min;
   utLocal.wSecond = st.tm_sec;
   utLocal.wMilliseconds = curTime.tv_usec / 1000;
 #endif
   Set(utLocal.wYear, (uint8_t)utLocal.wMonth, (uint8_t)utLocal.wDay,
       (uint8_t)utLocal.wHour, (uint8_t)utLocal.wMinute,
-      (uint8_t)utLocal.wSecond, (FX_WORD)utLocal.wMilliseconds);
+      (uint8_t)utLocal.wSecond, (uint16_t)utLocal.wMilliseconds);
 }
 void CFX_Unitime::Set(int32_t year,
                       uint8_t month,
                       uint8_t day,
                       uint8_t hour,
                       uint8_t minute,
                       uint8_t second,
-                      FX_WORD millisecond) {
+                      uint16_t millisecond) {
   FXSYS_assert(hour <= 23);
   FXSYS_assert(minute <= 59);
   FXSYS_assert(second <= 59);
   FXSYS_assert(millisecond <= 999);
   m_iUnitime = (int64_t)hour * g_FXMillisecondsPerHour +
                (int64_t)minute * g_FXMillisecondsPerMinute +
                (int64_t)second * g_FXMillisecondsPerSecond + millisecond;
   if (year > 0) {
     m_iUnitime =
         m_iUnitime +
@@ skipping 21 matching lines @@
   FX_DaysToDate(GetDayOfAD(), iYear, iMonth, iDay);
   return iDay;
 }
 FX_WEEKDAY CFX_Unitime::GetDayOfWeek() const {
   int32_t v = (int32_t)((m_iUnitime / g_FXMillisecondsPerDay + 1) % 7);
   if (v < 0) {
     v += 7;
   }
   return (FX_WEEKDAY)v;
 }
-FX_WORD CFX_Unitime::GetDayOfYear() const {
+uint16_t CFX_Unitime::GetDayOfYear() const {
   int32_t iYear;
   uint8_t iMonth, iDay;
   FX_DaysToDate(GetDayOfAD(), iYear, iMonth, iDay);
   return FX_DaysBeforeMonthInYear(iYear, iMonth) + iDay;
 }
 int64_t CFX_Unitime::GetDayOfAD() const {
   FX_BOOL bBC = m_iUnitime < 0;
   int64_t iDays = m_iUnitime / g_FXMillisecondsPerDay;
   iDays += bBC ? -1 : 0;
   if (bBC && (m_iUnitime % g_FXMillisecondsPerDay) == 0) {
@@ skipping 15 matching lines @@
   }
   return (uint8_t)(v / g_FXMillisecondsPerMinute);
 }
 uint8_t CFX_Unitime::GetSecond() const {
   int32_t v = (int32_t)(m_iUnitime % g_FXMillisecondsPerMinute);
   if (v < 0) {
     v += g_FXMillisecondsPerMinute;
   }
   return (uint8_t)(v / g_FXMillisecondsPerSecond);
 }
-FX_WORD CFX_Unitime::GetMillisecond() const {
+uint16_t CFX_Unitime::GetMillisecond() const {
   int32_t v = (int32_t)(m_iUnitime % g_FXMillisecondsPerSecond);
   if (v < 0) {
     v += g_FXMillisecondsPerSecond;
   }
-  return (FX_WORD)v;
+  return (uint16_t)v;
 }
 FX_BOOL CFX_Unitime::AddYears(int32_t iYears) {
   FX_UNITIME ut = m_iUnitime;
   if (ut < 0) {
     ut = -ut;
   }
   FX_UNITIME r = ut % g_FXMillisecondsPerDay;
   int32_t iYear;
   uint8_t iMonth, iDay;
   FX_DaysToDate(GetDayOfAD(), iYear, iMonth, iDay);
@@ skipping 50 matching lines @@
 FX_BOOL CFX_Unitime::AddMilliseconds(int32_t iMilliseconds) {
   m_iUnitime += iMilliseconds;
   return TRUE;
 }
 FX_BOOL CFX_DateTime::Set(int32_t year,
                           uint8_t month,
                           uint8_t day,
                           uint8_t hour,
                           uint8_t minute,
                           uint8_t second,
-                          FX_WORD millisecond) {
+                          uint16_t millisecond) {
   ASSERT(year != 0);
   ASSERT(month >= 1 && month <= 12);
   ASSERT(day >= 1 && day <= FX_DaysInMonth(year, month));
   ASSERT(hour <= 23);
   ASSERT(minute <= 59);
   ASSERT(second <= 59);
   ASSERT(millisecond <= 999);
   m_DateTime.Date.sDate.year = year;
   m_DateTime.Date.sDate.month = month;
   m_DateTime.Date.sDate.day = day;
@@ skipping 36 matching lines @@
 FX_WEEKDAY CFX_DateTime::GetDayOfWeek() const {
   int32_t v = (int32_t)(FX_DateToDays(m_DateTime.Date.sDate.year,
                                       m_DateTime.Date.sDate.month,
                                       m_DateTime.Date.sDate.day, TRUE) %
                         7);
   if (v < 0) {
     v += 7;
   }
   return (FX_WEEKDAY)v;
 }
-FX_WORD CFX_DateTime::GetDayOfYear() const {
+uint16_t CFX_DateTime::GetDayOfYear() const {
   return FX_DaysBeforeMonthInYear(m_DateTime.Date.sDate.year,
                                   m_DateTime.Date.sDate.month) +
          m_DateTime.Date.sDate.day;
 }
 int64_t CFX_DateTime::GetDayOfAD() const {
   return FX_DateToDays(m_DateTime.Date.sDate.year, m_DateTime.Date.sDate.month,
                        m_DateTime.Date.sDate.day, TRUE);
 }
 uint8_t CFX_DateTime::GetHour() const {
   return m_DateTime.Date.sDate.day;
 }
 uint8_t CFX_DateTime::GetMinute() const {
   return m_DateTime.Time.sTime.minute;
 }
 uint8_t CFX_DateTime::GetSecond() const {
   return m_DateTime.Time.sTime.second;
 }
-FX_WORD CFX_DateTime::GetMillisecond() const {
+uint16_t CFX_DateTime::GetMillisecond() const {
   return m_DateTime.Time.sTime.millisecond;
 }
 FX_BOOL CFX_DateTime::AddYears(int32_t iYears) {
   if (iYears == 0) {
     return FALSE;
   }
   int32_t v = m_DateTime.Date.sDate.year + iYears;
   if (v >= 0 && m_DateTime.Date.sDate.year < 0) {
     v++;
   } else if (v <= 0 && m_DateTime.Date.sDate.year > 0) {
@@ skipping 96 matching lines @@
 FX_BOOL CFX_DateTime::AddMilliseconds(int32_t iMilliseconds) {
   if (iMilliseconds == 0) {
     return FALSE;
   }
   iMilliseconds += m_DateTime.Time.sTime.millisecond;
   int32_t iSeconds = (int32_t)(iMilliseconds / g_FXMillisecondsPerSecond);
   iMilliseconds %= g_FXMillisecondsPerSecond;
   if (iMilliseconds < 0) {
     iSeconds--, iMilliseconds += g_FXMillisecondsPerSecond;
   }
-  m_DateTime.Time.sTime.millisecond = (FX_WORD)iMilliseconds;
+  m_DateTime.Time.sTime.millisecond = (uint16_t)iMilliseconds;
   if (iSeconds != 0) {
     AddSeconds(iSeconds);
   }
   return TRUE;
 }