Remove FX_WORD in favor of uint16_t.

core/fpdfapi/fpdf_cmaps/cmap_int.h

Index: core/fpdfapi/fpdf_cmaps/cmap_int.h
diff --git a/core/fpdfapi/fpdf_cmaps/cmap_int.h b/core/fpdfapi/fpdf_cmaps/cmap_int.h
index a812d84f335db2d334c2d7f51b452d28a42b4695..cb99e52ed15e398922950815b08b17e2c8d50117 100644
--- a/core/fpdfapi/fpdf_cmaps/cmap_int.h
+++ b/core/fpdfapi/fpdf_cmaps/cmap_int.h
@@ -7,17 +7,17 @@
 #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;
 };
@@ -26,7 +26,7 @@ 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_