diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-05-25 23:37:50 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-25 23:37:50 +0000 |
| commit | ca02733961f84abd562d59e4b6a83018ef41b143 (patch) | |
| tree | a5f2cb28353fc82aab57f99d6605f5b817a04cce /fpdfsdk/cpdfsdk_helpers.h | |
| parent | df93cd35530e7b8dd67abde8d199c36c3fae76be (diff) | |
| download | pdfium-ca02733961f84abd562d59e4b6a83018ef41b143.tar.xz | |
Replace some #ifdefs PDF_ENABLE_XFA, part 2.
Tidy some code encountered along the way in cpdfsdk_helpers.cpp
Remove one ifdef from xfa-only file.
Restore some option flag processing (probably wrong to remove).
Flip some #ifndef to #ifdef (#ifndef PDF_ENABLE_XFA is an
anti-pattern and should be treated with suspicion since XFA should
always be "additive").
Change-Id: I564a28401e20e6269c85ea610da8c96f8c8dd737
Reviewed-on: https://pdfium-review.googlesource.com/32834
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fpdfsdk/cpdfsdk_helpers.h')
| -rw-r--r-- | fpdfsdk/cpdfsdk_helpers.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fpdfsdk/cpdfsdk_helpers.h b/fpdfsdk/cpdfsdk_helpers.h index 10f44e409a..ba54645de8 100644 --- a/fpdfsdk/cpdfsdk_helpers.h +++ b/fpdfsdk/cpdfsdk_helpers.h @@ -50,10 +50,10 @@ class CXFA_FFWidget; // Object types for public FPDF_ types; these correspond to next layer down // from fpdfsdk. For master, these are CPDF_ types, but for XFA, these are // CPDFXFA_ types. -#ifndef PDF_ENABLE_XFA -using UnderlyingPageType = CPDF_Page; -#else // PDF_ENABLE_XFA +#ifdef PDF_ENABLE_XFA using UnderlyingPageType = CPDFXFA_Page; +#else // PDF_ENABLE_XFA +using UnderlyingPageType = CPDF_Page; #endif // PDF_ENABLE_XFA // Conversions to/from underlying types. |