XFA: merge patch from issue 801913002 and 804463003

fpdfsdk/include/fsdk_define.h

Index: fpdfsdk/include/fsdk_define.h
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h
index b95d63eab40638a1f98b1c2cde1385a0e643bddc..3509e8e2ab394f2ee1fc16c961407f68e5163955 100644
--- a/fpdfsdk/include/fsdk_define.h
+++ b/fpdfsdk/include/fsdk_define.h
@@ -12,66 +12,33 @@
 #include <math.h>
 #endif
 
-//#define API5
-#define API6
-#define  _FPDFAPI_ASYNC_PARSING_
-#define _FXSDK_OPENSOURCE_
-
-#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/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 "../../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 "../../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"
 
 
 #ifndef FX_GetAValue