From ca02733961f84abd562d59e4b6a83018ef41b143 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 25 May 2018 23:37:50 +0000 Subject: 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 Reviewed-by: Lei Zhang --- public/fpdf_formfill.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'public') diff --git a/public/fpdf_formfill.h b/public/fpdf_formfill.h index 73964b2a93..f372d84b95 100644 --- a/public/fpdf_formfill.h +++ b/public/fpdf_formfill.h @@ -1546,10 +1546,10 @@ FORM_ForceToKillFocus(FPDF_FORMHANDLE hHandle); #define FPDF_FORMFIELD_XFA_TEXTFIELD 15 // XFA text field type. #endif // PDF_ENABLE_XFA -#ifndef PDF_ENABLE_XFA -#define FPDF_FORMFIELD_COUNT 8 -#else +#ifdef PDF_ENABLE_XFA #define FPDF_FORMFIELD_COUNT 16 +#else +#define FPDF_FORMFIELD_COUNT 8 #endif // PDF_ENABLE_XFA #ifdef PDF_ENABLE_XFA -- cgit v1.2.3