summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BUILD.gn4
-rw-r--r--fpdfsdk/cpdfsdk_xfaannothandler.cpp4
-rw-r--r--fpdfsdk/include/cpdfsdk_xfaannothandler.h3
-rw-r--r--pdfium.gyp4
4 files changed, 4 insertions, 11 deletions
diff --git a/BUILD.gn b/BUILD.gn
index b69fb700ae..b020ab2490 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -73,7 +73,6 @@ static_library("pdfium") {
"fpdfsdk/cpdfsdk_datetime.cpp",
"fpdfsdk/cpdfsdk_interform.cpp",
"fpdfsdk/cpdfsdk_widget.cpp",
- "fpdfsdk/cpdfsdk_xfaannothandler.cpp",
"fpdfsdk/fpdf_dataavail.cpp",
"fpdfsdk/fpdf_ext.cpp",
"fpdfsdk/fpdf_flatten.cpp",
@@ -101,7 +100,6 @@ static_library("pdfium") {
"fpdfsdk/include/cpdfsdk_datetime.h",
"fpdfsdk/include/cpdfsdk_interform.h",
"fpdfsdk/include/cpdfsdk_widget.h",
- "fpdfsdk/include/cpdfsdk_xfaannothandler.h",
"fpdfsdk/include/fsdk_actionhandler.h",
"fpdfsdk/include/fsdk_pauseadapter.h",
"fpdfsdk/include/ifpdfsdk_annothandler.h",
@@ -145,7 +143,9 @@ static_library("pdfium") {
if (pdf_enable_xfa) {
sources += [
+ "fpdfsdk/cpdfsdk_xfaannothandler.cpp",
"fpdfsdk/cpdfsdk_xfawidget.cpp",
+ "fpdfsdk/include/cpdfsdk_xfaannothandler.h",
"fpdfsdk/include/cpdfsdk_xfawidget.h",
]
diff --git a/fpdfsdk/cpdfsdk_xfaannothandler.cpp b/fpdfsdk/cpdfsdk_xfaannothandler.cpp
index 8b1ed5c054..94f6f4abdc 100644
--- a/fpdfsdk/cpdfsdk_xfaannothandler.cpp
+++ b/fpdfsdk/cpdfsdk_xfaannothandler.cpp
@@ -6,8 +6,6 @@
#include "fpdfsdk/include/cpdfsdk_xfaannothandler.h"
-#ifdef PDF_ENABLE_XFA
-
#include "core/fpdfdoc/include/cpdf_interform.h"
#include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h"
#include "fpdfsdk/include/cpdfsdk_annot.h"
@@ -390,5 +388,3 @@ uint32_t CPDFSDK_XFAAnnotHandler::GetFWLFlags(uint32_t dwFlag) {
return dwFWLFlag;
}
-
-#endif // PDF_ENABLE_XFA
diff --git a/fpdfsdk/include/cpdfsdk_xfaannothandler.h b/fpdfsdk/include/cpdfsdk_xfaannothandler.h
index 664d48ff07..db5e4b7ea6 100644
--- a/fpdfsdk/include/cpdfsdk_xfaannothandler.h
+++ b/fpdfsdk/include/cpdfsdk_xfaannothandler.h
@@ -7,8 +7,6 @@
#ifndef FPDFSDK_INCLUDE_CPDFSDK_XFAANNOTHANDLER_H_
#define FPDFSDK_INCLUDE_CPDFSDK_XFAANNOTHANDLER_H_
-#ifdef PDF_ENABLE_XFA
-
#include "core/fxcrt/include/fx_basic.h"
#include "core/fxcrt/include/fx_coordinates.h"
#include "fpdfsdk/include/ipdfsdk_annothandler.h"
@@ -112,6 +110,5 @@ class CPDFSDK_XFAAnnotHandler : public IPDFSDK_AnnotHandler {
CPDFDoc_Environment* m_pApp;
};
-#endif // PDF_ENABLE_XFA
#endif // FPDFSDK_INCLUDE_CPDFSDK_XFAANNOTHANDLER_H_
diff --git a/pdfium.gyp b/pdfium.gyp
index d5f870ca7e..329764fd4c 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -95,7 +95,6 @@
'fpdfsdk/include/cpdfsdk_datetime.h',
'fpdfsdk/include/cpdfsdk_interform.h',
'fpdfsdk/include/cpdfsdk_widget.h',
- 'fpdfsdk/include/cpdfsdk_xfaannothandler.h',
'fpdfsdk/include/fsdk_actionhandler.h',
'fpdfsdk/include/fsdk_pauseadapter.h',
'fpdfsdk/include/ipdfsdk_annothandler.h',
@@ -109,7 +108,6 @@
'fpdfsdk/cpdfsdk_datetime.cpp',
'fpdfsdk/cpdfsdk_interform.cpp',
'fpdfsdk/cpdfsdk_widget.cpp',
- 'fpdfsdk/cpdfsdk_xfaannothandler.cpp',
'fpdfsdk/fpdfdoc.cpp',
'fpdfsdk/fpdfeditimg.cpp',
'fpdfsdk/fpdfeditpage.cpp',
@@ -151,7 +149,9 @@
'fpdfxfa',
],
'sources': [
+ 'fpdfsdk/cpdfsdk_xfaannothandler.cpp',
'fpdfsdk/cpdfsdk_xfawidget.cpp',
+ 'fpdfsdk/include/cpdfsdk_xfaannothandler.h',
'fpdfsdk/include/cpdfsdk_xfawidget.h',
],
}],