XFA: merge patch from issue 801913002 and 804463003

fpdfsdk/include/fsdk_define.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef _FPDFSDK_DEFINE_H
 #define _FPDFSDK_DEFINE_H
 
 #ifdef _WIN32
 #include <tchar.h>
 #include <math.h>
 #endif
 
-//#define API5
-#define API6
-#define  _FPDFAPI_ASYNC_PARSING_
-#define _FXSDK_OPENSOURCE_
+#include "../../core/include/fpdfapi/fpdf_parser.h" 
+#include "../../core/include/fpdfapi/fpdfapi.h" 
+#include "../../core/include/fpdfapi/fpdf_parser.h" 
+#include "../../core/include/fpdfapi/fpdf_module.h" 
+#include "../../core/include/fpdfapi/fpdf_render.h" 
+#include "../../core/include/fpdfapi/fpdf_pageobj.h" 
+#include "../../core/include/fpdfapi/fpdf_serial.h" 
 
-#ifdef _FPDFEMB_WCE_
-        #include "../../core/include/fpdfapi/fpdfapi.h" 
-        #include "../../core/include/fpdfapi/fpdf_parser.h" 
-        #include "../../core/include/fpdfapi/fpdf_module.h" 
-        #include "../../core/include/fpdfapi/fpdf_render.h" 
-        #include "../../core/include/fpdfapi/fpdf_pageobj.h" 
-        #include "../../core/include/fpdfapi/fpdf_serial.h" 
+#include "../../core/include/fpdftext/fpdf_text.h"
 
-        #include "../../core/include/fpdftext/fpdf_text.h"
+#include "../../core/include/fxge/fx_ge_win32.h"
+#include "../../core/include/fxge/fx_ge.h"
 
-        #include "../../core/include/fxge/fx_ge_win32.h"
-        #include "../../core/include/fxge/fx_ge.h"
+#include "../../core/include/fxcodec/fx_codec.h"
 
-        #include "../../core/include/fxcodec/fx_codec.h"
+#include "../../core/include/fpdfdoc/fpdf_doc.h" 
+#include "../../core/include/fpdfdoc/fpdf_vt.h" 
 
-        #include "../../core/include/fpdfdoc/fpdf_doc.h" 
-        #include "../../core/include/fpdfdoc/fpdf_vt.h" 
+#include "../../core/include/fxcrt/fx_xml.h" 
+#include "../../xfa/include/fxbarcode/BC_BarCode.h"
+#include "../../xfa/include/fxjse/fxjse.h"
+#include "../../xfa/include/fxgraphics/fx_graphics.h"
+#include "../../xfa/include/fxfa/fxfa.h"
 
-        #include "../../core/include/fxcrt/fx_xml.h" 
-        #include "../../core/include/fxcrt/fx_crypt.h"
-
-#else
-        #ifdef API6
-                #include "../../core/include/fpdfapi/fpdf_parser.h" 
-                #include "../../core/include/fpdfapi/fpdfapi.h" 
-                #include "../../core/include/fpdfapi/fpdf_parser.h" 
-                #include "../../core/include/fpdfapi/fpdf_module.h" 
-                #include "../../core/include/fpdfapi/fpdf_render.h" 
-                #include "../../core/include/fpdfapi/fpdf_pageobj.h" 
-                #include "../../core/include/fpdfapi/fpdf_serial.h" 
-
-                #include "../../core/include/fpdftext/fpdf_text.h"
-
-                #include "../../core/include/fxge/fx_ge_win32.h"
-                #include "../../core/include/fxge/fx_ge.h"
-
-                #include "../../core/include/fxcodec/fx_codec.h"
-
-                #include "../../core/include/fpdfdoc/fpdf_doc.h" 
-                #include "../../core/include/fpdfdoc/fpdf_vt.h" 
-
-                #include "../../core/include/fxcrt/fx_xml.h" 
-                #include "../../xfa/include/fxbarcode/BC_BarCode.h"
-                #include "../../xfa/include/fxjse/fxjse.h"
-                #include "../../xfa/include/fxgraphics/fx_graphics.h"
-                #include "../../xfa/include/fxfa/fxfa.h"
-
-                #include "../../xfa/include/fwl/core/fwl_error.h"
-                #include "../../xfa/include/fwl/core/fwl_timer.h"
-                #include "../../xfa/include/fwl/adapter/fwl_adaptertimermgr.h"
-                #ifdef _LICENSED_BUILD_
-                        #include "../../cryptopp/Cryptlib.h"
-                #endif
-        #endif
-#endif
+#include "../../xfa/include/fwl/core/fwl_error.h"
+#include "../../xfa/include/fwl/core/fwl_timer.h"
+#include "../../xfa/include/fwl/adapter/fwl_adaptertimermgr.h"
 
 
 #ifndef FX_GetAValue
 /** @brief It retrieves an intensity value for the alpha component of a #FX_ARGB value. */
 #define FX_GetAValue(argb)                      ((argb & 0xFF000000) >> 24)
 #endif
 
 #ifndef FX_GetRValue
 /** @brief It retrieves an intensity value for the red component of a #FX_ARGB value. */
 #define FX_GetRValue(argb)                      ((argb & 0x00FF0000) >> 16)
@@ skipping 64 matching lines @@
 protected:
         FPDF_FILEHANDLER*       m_pFS;
         FX_FILESIZE             m_nCurPos;
 };
 
 void            FSDK_SetSandBoxPolicy(FPDF_DWORD policy, FPDF_BOOL enable);
 FPDF_BOOL       FSDK_IsSandBoxPolicyEnabled(FPDF_DWORD policy);
 
 
 #endif//_FPDFSDK_DEFINE_H