From bb17868d736f698d5217c30d52c5bbfed62c5936 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 9 Jun 2015 11:30:25 -0700 Subject: Use stdint.h types throughout PDFium. It's redundant nowadays to provide our own equivalents, now that this is done for us by the system header. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1177483002 --- fpdfsdk/include/javascript/Field.h | 4 ++-- fpdfsdk/include/javascript/IJavaScript.h | 2 +- fpdfsdk/include/javascript/JS_Define.h | 2 +- fpdfsdk/include/javascript/JS_GlobalData.h | 6 +++--- fpdfsdk/include/javascript/util.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'fpdfsdk/include/javascript') diff --git a/fpdfsdk/include/javascript/Field.h b/fpdfsdk/include/javascript/Field.h index 0da08b6e95..573fb392c0 100644 --- a/fpdfsdk/include/javascript/Field.h +++ b/fpdfsdk/include/javascript/Field.h @@ -87,7 +87,7 @@ struct CJS_DelayData CFX_WideString sFieldName; int nControlIndex; enum FIELD_PROP eProp; - FX_INT32 num; + int32_t num; bool b; CFX_ByteString string; CFX_WideString widestring; @@ -244,7 +244,7 @@ protected: CPDF_FormControl* GetSmartFieldControl(CPDF_FormField* pFormField); FX_BOOL ValueIsOccur(CPDF_FormField* pFormField, CFX_WideString csOptLabel); - void AddDelay_Int(enum FIELD_PROP prop, FX_INT32 n); + void AddDelay_Int(enum FIELD_PROP prop, int32_t n); void AddDelay_Bool(enum FIELD_PROP prop,bool b); void AddDelay_String(enum FIELD_PROP prop, const CFX_ByteString& string); void AddDelay_WideString(enum FIELD_PROP prop, const CFX_WideString& string); diff --git a/fpdfsdk/include/javascript/IJavaScript.h b/fpdfsdk/include/javascript/IJavaScript.h index 0900109021..2495876941 100644 --- a/fpdfsdk/include/javascript/IJavaScript.h +++ b/fpdfsdk/include/javascript/IJavaScript.h @@ -106,7 +106,7 @@ private: FX_BOOL m_bInit; int m_nRef; CJS_GlobalData* m_pGlobalData; - FX_INT32 m_nGlobalDataCount; + int32_t m_nGlobalDataCount; }; #endif // FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_ diff --git a/fpdfsdk/include/javascript/JS_Define.h b/fpdfsdk/include/javascript/JS_Define.h index 86c50f30a9..01952714ba 100644 --- a/fpdfsdk/include/javascript/JS_Define.h +++ b/fpdfsdk/include/javascript/JS_Define.h @@ -17,7 +17,7 @@ struct JSConstSpec const wchar_t* pName; double number; const wchar_t* string; - FX_BYTE t; //0:double 1:str + uint8_t t; //0:double 1:str }; struct JSPropertySpec diff --git a/fpdfsdk/include/javascript/JS_GlobalData.h b/fpdfsdk/include/javascript/JS_GlobalData.h index 276ff8cd4b..f19265c651 100644 --- a/fpdfsdk/include/javascript/JS_GlobalData.h +++ b/fpdfsdk/include/javascript/JS_GlobalData.h @@ -75,7 +75,7 @@ public: FX_BOOL SetGlobalVariablePersistent(FX_LPCSTR propname, FX_BOOL bPersistent); FX_BOOL DeleteGlobalVariable(FX_LPCSTR propname); - FX_INT32 GetSize() const; + int32_t GetSize() const; CJS_GlobalData_Element* GetAt(int index) const; private: @@ -85,8 +85,8 @@ private: CJS_GlobalData_Element* GetGlobalVariable(FX_LPCSTR propname); int FindGlobalVariable(FX_LPCSTR propname); - void LoadFileBuffer(FX_LPCWSTR sFilePath, FX_LPBYTE& pBuffer, FX_INT32& nLength); - void WriteFileBuffer(FX_LPCWSTR sFilePath, FX_LPCSTR pBuffer, FX_INT32 nLength); + void LoadFileBuffer(FX_LPCWSTR sFilePath, FX_LPBYTE& pBuffer, int32_t& nLength); + void WriteFileBuffer(FX_LPCWSTR sFilePath, FX_LPCSTR pBuffer, int32_t nLength); void MakeByteString(const CFX_ByteString& name, CJS_KeyValue* pData, CFX_BinaryBuf& sData); private: diff --git a/fpdfsdk/include/javascript/util.h b/fpdfsdk/include/javascript/util.h index b621067bc3..07f52ab8ce 100644 --- a/fpdfsdk/include/javascript/util.h +++ b/fpdfsdk/include/javascript/util.h @@ -45,6 +45,6 @@ public: JS_STATIC_METHOD(byteToChar, util); }; -FX_INT64 FX_atoi64(const char *nptr); +int64_t FX_atoi64(const char *nptr); #endif // FPDFSDK_INCLUDE_JAVASCRIPT_UTIL_H_ -- cgit v1.2.3