Merge to XFA: Use stdint.h types throughout PDFium.
[pdfium.git] / fpdfsdk / src / fpdfxfa / fpdfxfa_util.cpp
index fb625d2..ac5ef21 100644 (file)
@@ -14,7 +14,7 @@ FWL_ERR CXFA_FWLAdapterTimerMgr::Start(IFWL_Timer *pTimer, FX_DWORD dwElapse, FW
 {\r
        if (m_pEnv)\r
        {\r
-               FX_UINT32 uIDEvent = m_pEnv->FFI_SetTimer(dwElapse, TimerProc);\r
+               uint32_t uIDEvent = m_pEnv->FFI_SetTimer(dwElapse, TimerProc);\r
                CFWL_TimerInfo *pInfo = FX_NEW CFWL_TimerInfo;\r
                pInfo->uIDEvent = uIDEvent;\r
                pInfo->pTimer = pTimer;\r
@@ -37,7 +37,7 @@ FWL_ERR CXFA_FWLAdapterTimerMgr::Stop(FWL_HTIMER hTimer)
 \r
                m_pEnv->FFI_KillTimer(pInfo->uIDEvent);\r
 \r
-               FX_INT32 index = ms_timerArray.Find(pInfo);\r
+               int32_t index = ms_timerArray.Find(pInfo);\r
                if (index >= 0)\r
                {\r
                        ms_timerArray.RemoveAt(index);\r
@@ -49,11 +49,11 @@ FWL_ERR CXFA_FWLAdapterTimerMgr::Stop(FWL_HTIMER hTimer)
        return FWL_ERR_Indefinite;\r
 }\r
 \r
-void CXFA_FWLAdapterTimerMgr::TimerProc(FX_INT32 idEvent)\r
+void CXFA_FWLAdapterTimerMgr::TimerProc(int32_t idEvent)\r
 {\r
        CFWL_TimerInfo *pInfo = NULL;\r
-       FX_INT32 iCount = CXFA_FWLAdapterTimerMgr::ms_timerArray.GetSize();\r
-       for (FX_INT32 i = 0; i < iCount; i++)\r
+       int32_t iCount = CXFA_FWLAdapterTimerMgr::ms_timerArray.GetSize();\r
+       for (int32_t i = 0; i < iCount; i++)\r
        {\r
                CFWL_TimerInfo *pTemp = (CFWL_TimerInfo*)CXFA_FWLAdapterTimerMgr::ms_timerArray.GetAt(i);\r
                if (pTemp->uIDEvent == idEvent)\r