Remove FX_WORD in favor of uint16_t.

core/include/fxcrt/fx_system.h

 // 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
 
 #ifndef CORE_INCLUDE_FXCRT_FX_SYSTEM_H_
 #define CORE_INCLUDE_FXCRT_FX_SYSTEM_H_
 
 #include <assert.h>
@@ skipping 50 matching lines @@
 
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
 #include <Carbon/Carbon.h>
 #include <libkern/OSAtomic.h>
 #endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 typedef void* FX_POSITION;       // Keep until fxcrt containers gone
-typedef uint16_t FX_WORD;        // Keep - "an efficient small type"
 typedef uint32_t FX_DWORD;       // Keep - "an efficient type"
 typedef float FX_FLOAT;          // Keep, allow upgrade to doubles.
 typedef double FX_DOUBLE;        // Keep, allow downgrade to floats.
 typedef int FX_BOOL;             // Keep, sadly not always 0 or 1.
 typedef char FX_CHAR;            // Keep, questionable signedness.
 typedef wchar_t FX_WCHAR;        // Keep, maybe bad platform wchars.
 
 // PDFium string sizes are limited to 2^31-1, and the value is signed to
 // allow -1 as a placeholder for "unknown".
 // TODO(palmer): it should be a |size_t|, or at least unsigned.
@@ skipping 177 matching lines @@
   (((uint8_t)(i) << 24) | ((uint8_t)((i) >> 8) << 16) | \
    ((uint8_t)((i) >> 16) << 8) | (uint8_t)((i) >> 24))
 #define FXDWORD_GET_LSBFIRST(p)                                                \
   ((static_cast<FX_DWORD>(p[3]) << 24) | (static_cast<FX_DWORD>(p[2]) << 16) | \
    (static_cast<FX_DWORD>(p[1]) << 8) | (static_cast<FX_DWORD>(p[0])))
 #define FXDWORD_GET_MSBFIRST(p)                                                \
   ((static_cast<FX_DWORD>(p[0]) << 24) | (static_cast<FX_DWORD>(p[1]) << 16) | \
    (static_cast<FX_DWORD>(p[2]) << 8) | (static_cast<FX_DWORD>(p[3])))
 #define FXSYS_HIBYTE(word) ((uint8_t)((word) >> 8))
 #define FXSYS_LOBYTE(word) ((uint8_t)(word))
-#define FXSYS_HIWORD(dword) ((FX_WORD)((dword) >> 16))
-#define FXSYS_LOWORD(dword) ((FX_WORD)(dword))
+#define FXSYS_HIWORD(dword) ((uint16_t)((dword) >> 16))
+#define FXSYS_LOWORD(dword) ((uint16_t)(dword))
 int32_t FXSYS_atoi(const FX_CHAR* str);
 uint32_t FXSYS_atoui(const FX_CHAR* str);
 int32_t FXSYS_wtoi(const FX_WCHAR* str);
 int64_t FXSYS_atoi64(const FX_CHAR* str);
 int64_t FXSYS_wtoi64(const FX_WCHAR* str);
 const FX_CHAR* FXSYS_i64toa(int64_t value, FX_CHAR* str, int radix);
 int FXSYS_round(FX_FLOAT f);
 #define FXSYS_sqrt2(a, b) (FX_FLOAT) FXSYS_sqrt((a) * (a) + (b) * (b))
 #ifdef __cplusplus
 };
@@ skipping 31 matching lines @@
 
 // Prevent a function from ever being inlined, typically because we'd
 // like it to appear in stack traces.
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 #define NEVER_INLINE __declspec(noinline)
 #else  // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 #define NEVER_INLINE __attribute__((__noinline__))
 #endif  // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 
 #endif  // CORE_INCLUDE_FXCRT_FX_SYSTEM_H_