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/fgas/include/fx_sys.h | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'xfa/src/fgas/include/fx_sys.h')

diff --git a/xfa/src/fgas/include/fx_sys.h b/xfa/src/fgas/include/fx_sys.h
index c0b5c7445f..8e099bce05 100644
--- a/xfa/src/fgas/include/fx_sys.h
+++ b/xfa/src/fgas/include/fx_sys.h
@@ -11,10 +11,10 @@ extern "C" {
 #endif
 #define FX_RAD2DEG(r)		((r) * 180.0f / FX_PI)
 #define FX_DEG2RAD(a)		((a) * FX_PI / 180.0f)
-typedef FX_INT8 *			FX_LPINT8;
-typedef FX_INT8 const *		FX_LPCINT8;
-typedef FX_INT32 *			FX_LPINT32;
-typedef FX_INT32 const *	FX_LPCINT32;
+typedef int8_t *			FX_LPINT8;
+typedef int8_t const *		FX_LPCINT8;
+typedef int32_t *			FX_LPINT32;
+typedef int32_t const *	FX_LPCINT32;
 typedef long				FX_LONG;
 typedef FX_LONG *			FX_LPLONG;
 typedef FX_LONG const *		FX_LPCLONG;
@@ -24,30 +24,30 @@ typedef FX_DOUBLE *			FX_LPDOUBLE;
 typedef FX_DOUBLE const *	FX_LPCDOUBLE;
 FX_FLOAT	FX_tan(FX_FLOAT a);
 FX_FLOAT	FX_log(FX_FLOAT b, FX_FLOAT x);
-FX_FLOAT	FX_strtof(FX_LPCSTR pcsStr, FX_INT32 iLength = -1, FX_INT32 *pUsedLen = NULL);
-FX_FLOAT	FX_wcstof(FX_LPCWSTR pwsStr, FX_INT32 iLength = -1, FX_INT32 *pUsedLen = NULL);
+FX_FLOAT	FX_strtof(FX_LPCSTR pcsStr, int32_t iLength = -1, int32_t *pUsedLen = NULL);
+FX_FLOAT	FX_wcstof(FX_LPCWSTR pwsStr, int32_t iLength = -1, int32_t *pUsedLen = NULL);
 FX_LPWSTR	FX_wcsncpy(FX_LPWSTR dstStr, FX_LPCWSTR srcStr, size_t count);
-FX_INT32	FX_wcsnicmp(FX_LPCWSTR s1, FX_LPCWSTR s2, size_t count);
-FX_INT32	FX_strnicmp(FX_LPCSTR s1, FX_LPCSTR s2, size_t count);
-inline FX_BOOL	FX_islower(FX_INT32 ch)
+int32_t	FX_wcsnicmp(FX_LPCWSTR s1, FX_LPCWSTR s2, size_t count);
+int32_t	FX_strnicmp(FX_LPCSTR s1, FX_LPCSTR s2, size_t count);
+inline FX_BOOL	FX_islower(int32_t ch)
 {
     return ch >= 'a' && ch <= 'z';
 }
-inline FX_BOOL	FX_isupper(FX_INT32 ch)
+inline FX_BOOL	FX_isupper(int32_t ch)
 {
     return ch >= 'A' && ch <= 'Z';
 }
-inline FX_INT32	FX_tolower(FX_INT32 ch)
+inline int32_t	FX_tolower(int32_t ch)
 {
     return FX_isupper(ch) ? (ch + 0x20) : ch;
 }
-inline FX_INT32 FX_toupper(FX_INT32 ch)
+inline int32_t FX_toupper(int32_t ch)
 {
     return FX_islower(ch) ? (ch - 0x20) : ch;
 }
-FX_INT32	FX_filelength(FXSYS_FILE *file);
-FX_BOOL		FX_fsetsize(FXSYS_FILE *file, FX_INT32 size);
-void		FX_memset(FX_LPVOID pBuf, FX_INT32 iValue, size_t size);
+int32_t	FX_filelength(FXSYS_FILE *file);
+FX_BOOL		FX_fsetsize(FXSYS_FILE *file, int32_t size);
+void		FX_memset(FX_LPVOID pBuf, int32_t iValue, size_t size);
 void		FX_memcpy(FX_LPVOID pDst, FX_LPCVOID pSrc, size_t size);
 FX_BOOL		FX_IsRelativePath(const CFX_WideStringC &wsPath);
 FX_BOOL		FX_JoinPath(const CFX_WideStringC &wsBasePath, const CFX_WideStringC &wsRelativePath, CFX_WideString &wsAbsolutePath);
-- 
cgit v1.2.3