From a688a049e516a050bc3dc473910096f255552386 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 9 Nov 2015 13:57:49 -0800 Subject: Merge to XFA: Fix all relative includes to core. Do some IWYU to fix build errors due to files that have no #includes but just happened to work previously because the #includes were in the right order. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1407423004 . (cherry picked from commit 9e7cd8ffb81c564e1102f6c6459ec0942a0b11ea) Review URL: https://codereview.chromium.org/1425163004 . --- xfa/include/fwl/core/fwl_error.h | 12 +++++++++--- xfa/include/fwl/core/fwl_timer.h | 12 ++++++++---- 2 files changed, 17 insertions(+), 7 deletions(-) (limited to 'xfa/include/fwl') diff --git a/xfa/include/fwl/core/fwl_error.h b/xfa/include/fwl/core/fwl_error.h index 4c0f3b96e7..4f22dbbe57 100644 --- a/xfa/include/fwl/core/fwl_error.h +++ b/xfa/include/fwl/core/fwl_error.h @@ -4,9 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FWL_ERROR_H -#define _FWL_ERROR_H +#ifndef XFA_INCLUDE_FWL_CORE_FWL_ERROR_H_ +#define XFA_INCLUDE_FWL_CORE_FWL_ERROR_H_ + +#include + typedef int32_t FWL_ERR; + #define FWL_ERR_Succeeded 0 #define FWL_ERR_Indefinite -1 #define FWL_ERR_Parameter_Invalid -100 @@ -14,6 +18,7 @@ typedef int32_t FWL_ERR; #define FWL_ERR_Intermediate_Value__Invalid -300 #define FWL_ERR_Method_Not_Supported -400 #define FWL_ERR_Out_Of_Memory -500 + #if defined(__WIN32__) || defined(_WIN32) #define _FWL_ALARM_IF_FAIL(arg, alarm) \ { \ @@ -78,4 +83,5 @@ typedef int32_t FWL_ERR; if ((arg) != FWL_ERR_Succeeded) \ goto pos; \ } -#endif + +#endif // XFA_INCLUDE_FWL_CORE_FWL_ERROR_H_ diff --git a/xfa/include/fwl/core/fwl_timer.h b/xfa/include/fwl/core/fwl_timer.h index 4c8b466a52..8ed4da618c 100644 --- a/xfa/include/fwl/core/fwl_timer.h +++ b/xfa/include/fwl/core/fwl_timer.h @@ -4,10 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FWL_TIMER_H -#define _FWL_TIMER_H -class IFWL_Timer; +#ifndef XFA_INCLUDE_FWL_CORE_FWL_TIMER_H_ +#define XFA_INCLUDE_FWL_CORE_FWL_TIMER_H_ + +#include "core/include/fxcrt/fx_system.h" + typedef struct _FWL_HTIMER { void* pData; } * FWL_HTIMER; + class IFWL_Timer { public: virtual ~IFWL_Timer() {} @@ -17,4 +20,5 @@ FWL_HTIMER FWL_StartTimer(IFWL_Timer* pTimer, FX_DWORD dwElapse, FX_BOOL bImmediately = TRUE); int32_t FWL_StopTimer(FWL_HTIMER hTimer); -#endif + +#endif // XFA_INCLUDE_FWL_CORE_FWL_TIMER_H_ -- cgit v1.2.3