diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-06 15:52:32 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-06 15:52:32 -0800 |
| commit | b4e7f304af0ad92d20f952e6634000d177974f47 (patch) | |
| tree | 7cb2137e3854988079e4f027cad369189735e64b /fpdfsdk/include/fpdfxfa | |
| parent | 6cf117caa54c3bbf5a787c9ae9ca517a4ac98a16 (diff) | |
| download | pdfium-b4e7f304af0ad92d20f952e6634000d177974f47.tar.xz | |
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 .
Diffstat (limited to 'fpdfsdk/include/fpdfxfa')
| -rw-r--r-- | fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h | 1 | ||||
| -rw-r--r-- | fpdfsdk/include/fpdfxfa/fpdfxfa_util.h | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h index 0564ed0c4c..451b561ba0 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h +++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h @@ -8,6 +8,7 @@ #define FPDFXFA_DOC_H_
#include "../../../xfa/include/fxfa/fxfa.h"
+#include "public/fpdfview.h"
class CPDFXFA_App;
class CPDFXFA_Document;
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_
|