Remove FX_WORD in favor of uint16_t.

core/fpdfapi/fpdf_cmaps/cmap_int.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_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_
 #define CORE_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_
 
-#include "core/include/fxcrt/fx_system.h"  // For FX_WORD.
+#include "core/include/fxcrt/fx_system.h"  // For uint16_t.

[dsinclair, 2016/03/21 21:33:12]

ditto

[Tom Sepez, 2016/03/21 21:59:48]

Done.

 
 struct FXCMAP_CMap {
   enum MapType { None, Single, Range, Reverse };
 
   const char* m_Name;
   MapType m_WordMapType;
-  const FX_WORD* m_pWordMap;
+  const uint16_t* m_pWordMap;
   int m_WordCount;
   MapType m_DWordMapType;
-  const FX_WORD* m_pDWordMap;
+  const uint16_t* m_pDWordMap;
   int m_DWordCount;
   int m_UseOffset;
 };
 
 void FPDFAPI_FindEmbeddedCMap(const char* name,
                               int charset,
                               int coding,
                               const FXCMAP_CMap*& pMap);
-FX_WORD FPDFAPI_CIDFromCharCode(const FXCMAP_CMap* pMap, FX_DWORD charcode);
-FX_DWORD FPDFAPI_CharCodeFromCID(const FXCMAP_CMap* pMap, FX_WORD cid);
+uint16_t FPDFAPI_CIDFromCharCode(const FXCMAP_CMap* pMap, FX_DWORD charcode);
+FX_DWORD FPDFAPI_CharCodeFromCID(const FXCMAP_CMap* pMap, uint16_t cid);
 
 #endif  // CORE_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_