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
---
 xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h')

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
index 7639c032ba..d635137e9d 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
@@ -11,8 +11,8 @@ class CBC_PDF417ResultMetadata
 public:
     CBC_PDF417ResultMetadata();
     virtual ~CBC_PDF417ResultMetadata();
-    FX_INT32 getSegmentIndex();
-    void setSegmentIndex(FX_INT32 segmentIndex);
+    int32_t getSegmentIndex();
+    void setSegmentIndex(int32_t segmentIndex);
     CFX_ByteString getFileId();
     void setFileId(CFX_ByteString fileId);
     CFX_Int32Array& getOptionalData();
@@ -20,7 +20,7 @@ public:
     FX_BOOL isLastSegment();
     void setLastSegment(FX_BOOL lastSegment);
 private:
-    FX_INT32 m_segmentIndex;
+    int32_t m_segmentIndex;
     CFX_ByteString m_fileId;
     CFX_Int32Array m_optionalData;
     FX_BOOL m_lastSegment;
-- 
cgit v1.2.3