Merge to XFA: Use stdint.h types throughout PDFium.

xfa/src/fgas/src/localization/fx_localemgr.cpp

Index: xfa/src/fgas/src/localization/fx_localemgr.cpp
diff --git a/xfa/src/fgas/src/localization/fx_localemgr.cpp b/xfa/src/fgas/src/localization/fx_localemgr.cpp
index 3b93f101a39778daf347bf5c192907a9ba44e5cd..b3f0e80d7aea2e9b133b840d02fc14ca0014c8c6 100644
--- a/xfa/src/fgas/src/localization/fx_localemgr.cpp
+++ b/xfa/src/fgas/src/localization/fx_localemgr.cpp
@@ -38,10 +38,10 @@ IFX_LocaleMgr*	FX_LocaleMgr_Create(FX_LPCWSTR pszLocalPath, FX_WORD wDefaultLCID
                 CFX_WideString wsLCID = pXmlLocale->GetAttrValue("", "lcid");
                 wchar_t* pEnd = NULL;
                 FX_DWORD dwLCID = wcstol(wsLCID, &pEnd, 16);
-                if (pLocaleMgr->m_lcid2xml.GetValueAt((FX_LPVOID)(FX_UINTPTR)dwLCID)) {
+                if (pLocaleMgr->m_lcid2xml.GetValueAt((FX_LPVOID)(uintptr_t)dwLCID)) {
                     delete pXmlLocale;
                 } else {
-                    pLocaleMgr->m_lcid2xml.SetAt((FX_LPVOID)(FX_UINTPTR)dwLCID, pXmlLocale);
+                    pLocaleMgr->m_lcid2xml.SetAt((FX_LPVOID)(uintptr_t)dwLCID, pXmlLocale);
                 }
             } else {
                 delete pXmlLocale;
@@ -84,12 +84,12 @@ IFX_Locale* CFX_LocaleMgr::GetDefLocale()
 }
 IFX_Locale* CFX_LocaleMgr::GetLocale(FX_WORD lcid)
 {
-    IFX_Locale* pLocale = (IFX_Locale*)m_lcid2locale.GetValueAt((FX_LPVOID)(FX_UINTPTR)lcid);
+    IFX_Locale* pLocale = (IFX_Locale*)m_lcid2locale.GetValueAt((FX_LPVOID)(uintptr_t)lcid);
     if (!pLocale) {
-        CXML_Element* pxml = (CXML_Element*)m_lcid2xml.GetValueAt((FX_LPVOID)(FX_UINTPTR)lcid);
+        CXML_Element* pxml = (CXML_Element*)m_lcid2xml.GetValueAt((FX_LPVOID)(uintptr_t)lcid);
         if (pxml) {
             pLocale = IFX_Locale::Create(pxml);
-            m_lcid2locale.SetAt((FX_LPVOID)(FX_UINTPTR)lcid, pLocale);
+            m_lcid2locale.SetAt((FX_LPVOID)(uintptr_t)lcid, pLocale);
         }
     }
     return pLocale;