From bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Tue, 9 Jun 2015 13:24:12 -0700
Subject: Merge to XFA: Use stdint.h types throughout PDFium.

Near-automatic merge, plus re-running scripts to update
additional usage.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1172793002
---
 fpdfsdk/include/fpdfxfa/fpdfxfa_util.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'fpdfsdk/include/fpdfxfa/fpdfxfa_util.h')

diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h
index 6c3d15e4f1..9676b1399f 100644
--- a/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h
+++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h
@@ -23,7 +23,7 @@ public:
 	virtual FWL_ERR		Stop(FWL_HTIMER hTimer);
 
 protected:
-	static void TimerProc(FX_INT32 idEvent);
+	static void TimerProc(int32_t idEvent);
 
 	static CFX_PtrArray	ms_timerArray;
 	CPDFDoc_Environment* m_pEnv;
@@ -37,7 +37,7 @@ public:
 	{
 
 	}
-	FX_UINT32 uIDEvent;
+	uint32_t uIDEvent;
 	IFWL_Timer *pTimer;
 };
 
-- 
cgit v1.2.3