From b4e7f304af0ad92d20f952e6634000d177974f47 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 6 Nov 2015 15:52:32 -0800 Subject: Merge to XFA: Fix all relative includes to public. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1415803007 . (cherry picked from commit 5899671184d01b74989d181363066379ef3e4051) Review URL: https://codereview.chromium.org/1431593007 . --- fpdfsdk/include/fpdfxfa/fpdfxfa_util.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 a6f327a201..a64d030de5 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h +++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_util.h @@ -4,8 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FPDFXFA_UTIL_H_ -#define _FPDFXFA_UTIL_H_ +#ifndef FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_UTIL_H_ +#define FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_UTIL_H_ + +#include "xfa/include/fwl/adapter/fwl_adaptertimermgr.h" #define JS_STR_VIEWERTYPE_STANDARD L"Exchange" #define JS_STR_LANGUANGE L"ENU" @@ -30,9 +32,9 @@ class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr { class CFWL_TimerInfo { public: - CFWL_TimerInfo() : pTimer(NULL) {} + CFWL_TimerInfo() : pTimer(nullptr) {} uint32_t uIDEvent; IFWL_Timer* pTimer; }; -#endif +#endif // FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_UTIL_H_ -- cgit v1.2.3