Merge to XFA: Make (and verify) public/ files compile under C.

The following files needed adjustment beyond a mechanical merge:
   fpdfsdk/src/fpdfview.cpp
   public/fpdf_formfill.h
   samples/pdfium_test.cc
   testing/embedder_test.cpp

Original Review URL: https://codereview.chromium.org/1130843003

BUG=pdfium:158
R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1137233002

7 files changed, 25 insertions, 9 deletions

diff --git a/public/fpdf_dataavail.h b/public/fpdf_dataavail.h
index de6cb23bd5..bb929f4c70 100644
--- a/public/fpdf_dataavail.h
+++ b/public/fpdf_dataavail.h
@@ -47,7 +47,7 @@ typedef struct _FX_FILEAVAIL {
 	 * Comments:
 	 *		Called by Foxit SDK to check whether the data section is ready.
 	 */
-	bool (*IsDataAvail)(struct _FX_FILEAVAIL* pThis, size_t offset, size_t size);
+	FPDF_BOOL (*IsDataAvail)(struct _FX_FILEAVAIL* pThis, size_t offset, size_t size);
 } FX_FILEAVAIL;
 
 typedef void* FPDF_AVAIL;
diff --git a/public/fpdf_ext.h b/public/fpdf_ext.h
index 96e3c857fd..a67ac2eacf 100644
--- a/public/fpdf_ext.h
+++ b/public/fpdf_ext.h
@@ -53,8 +53,8 @@ typedef	struct _UNSUPPORT_INFO
 	* 		None.
 	* */
 
-	void(*FSDK_UnSupport_Handler)(_UNSUPPORT_INFO* pThis,int nType);
-}UNSUPPORT_INFO;
+	void(*FSDK_UnSupport_Handler)(struct _UNSUPPORT_INFO* pThis, int nType);
+} UNSUPPORT_INFO;
 
 
 /**
diff --git a/public/fpdf_formfill.h b/public/fpdf_formfill.h
index 5191fd75a8..cc8171657f 100644
--- a/public/fpdf_formfill.h
+++ b/public/fpdf_formfill.h
@@ -1107,7 +1107,7 @@ DLLEXPORT void STDCALL FPDF_FFLDraw(FPDF_FORMHANDLE hHandle,FPDF_BITMAP bitmap,
  * Return Value:
  *                      TRUE indicates that the input document has XFA fields, otherwise FALSE.
  **/
-DLLEXPORT FPDF_BOOL STDCALL FPDF_HasXFAField(FPDF_DOCUMENT document, int& docType);
+DLLEXPORT FPDF_BOOL STDCALL FPDF_HasXFAField(FPDF_DOCUMENT document, int* docType);
 
 /**
  * Function: FPDF_LoadXFA
diff --git a/public/fpdf_fwlevent.h b/public/fpdf_fwlevent.h
index f77e7e399f..f27499a1c6 100644
--- a/public/fpdf_fwlevent.h
+++ b/public/fpdf_fwlevent.h
@@ -9,6 +9,10 @@
 
 #include "fpdfview.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef int			FPDF_INT32;
 typedef unsigned int FPDF_UINT32;
 typedef float		FPDF_FLOAT;
@@ -281,6 +285,10 @@ struct FWL_EVENT
 	}s;
 };  
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif //_FWL_EVENT_H
 
 
diff --git a/public/fpdf_save.h b/public/fpdf_save.h
index 0909d5a447..28b169b0df 100644
--- a/public/fpdf_save.h
+++ b/public/fpdf_save.h
@@ -15,7 +15,7 @@ extern "C" {
 
 
 // Structure for custom file write
-struct FPDF_FILEWRITE{
+typedef struct FPDF_FILEWRITE_ {
 
 	//
 	//Version number of the interface. Currently must be 1.
@@ -38,9 +38,9 @@ struct FPDF_FILEWRITE{
 	// Return value:
 	//			Should be non-zero if successful, zero for error.
 	//
-	int		(*WriteBlock)( FPDF_FILEWRITE* pThis, const void* pData, unsigned long size);
+	int		(*WriteBlock)(struct FPDF_FILEWRITE_* pThis, const void* pData, unsigned long size);
 
-};
+} FPDF_FILEWRITE;
 
 
 /** @brief Incremental. */
diff --git a/public/fpdf_transformpage.h b/public/fpdf_transformpage.h
index 32b0ea008c..49de0891f6 100644
--- a/public/fpdf_transformpage.h
+++ b/public/fpdf_transformpage.h
@@ -11,6 +11,10 @@
 #include "fpdfview.h"
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef void* FPDF_PAGEARCSAVER;
 typedef void* FPDF_PAGEARCLOADER;
 /**
@@ -114,5 +118,9 @@ DLLEXPORT void STDCALL FPDF_DestroyClipPath(FPDF_CLIPPATH clipPath);
 */
 DLLEXPORT void STDCALL FPDFPage_InsertClipPath(FPDF_PAGE page,FPDF_CLIPPATH clipPath);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
diff --git a/public/fpdfview.h b/public/fpdfview.h
index d0b745ccfa..18acc6e25d 100644
--- a/public/fpdfview.h
+++ b/public/fpdfview.h
@@ -738,7 +738,7 @@ DLLEXPORT FPDF_DWORD STDCALL FPDF_CountNamedDests(FPDF_DOCUMENT document);
 // Return value:
 //			The handle of the dest.
 //
-DLLEXPORT FPDF_DEST STDCALL FPDF_GetNamedDestByName(FPDF_DOCUMENT document,FPDF_BYTESTRING name);
+DLLEXPORT FPDF_DEST STDCALL FPDF_GetNamedDestByName(FPDF_DOCUMENT document, FPDF_BYTESTRING name);
 
 // Function: FPDF_GetNamedDest
 //			Get the specified named destinations of the PDF document by index.
@@ -755,7 +755,7 @@ DLLEXPORT FPDF_DEST STDCALL FPDF_GetNamedDestByName(FPDF_DOCUMENT document,FPDF_
 //			2) Second time pass in allocated |buffer| and buflen to retrieve |buffer|, which should be used as wchar_t*.
 //			   If buflen is not sufficiently large, it will be set to -1 upon return.
 //
-DLLEXPORT FPDF_DEST STDCALL FPDF_GetNamedDest(FPDF_DOCUMENT document, int index, void* buffer, long& buflen);
+DLLEXPORT FPDF_DEST STDCALL FPDF_GetNamedDest(FPDF_DOCUMENT document, int index, void* buffer, long* buflen);
 
 // Function: FPDF_BStr_Init	
 //			Helper function to initialize a byte string.