From 1605351382dbaa84cbf5affedf1f3b89897da793 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 20 Sep 2018 16:02:36 +0000 Subject: Remove extraneous 'extern "C"' entries. Also remove dead code found along the way, and fix lint errors. BUG=pdfium:410 Change-Id: I4cd0ede516483209cf49a6686d909953ab196106 Reviewed-on: https://pdfium-review.googlesource.com/42771 Reviewed-by: Tom Sepez Reviewed-by: dsinclair Commit-Queue: Lei Zhang --- core/fxge/fontdata/chromefontdata/chromefontdata.h | 8 -------- core/fxge/fx_ge_fontmap.cpp | 8 -------- 2 files changed, 16 deletions(-) (limited to 'core/fxge') diff --git a/core/fxge/fontdata/chromefontdata/chromefontdata.h b/core/fxge/fontdata/chromefontdata/chromefontdata.h index 3cd8d1a8ca..cbd1ad2d6d 100644 --- a/core/fxge/fontdata/chromefontdata/chromefontdata.h +++ b/core/fxge/fontdata/chromefontdata/chromefontdata.h @@ -7,10 +7,6 @@ #ifndef CORE_FXGE_FONTDATA_CHROMEFONTDATA_CHROMEFONTDATA_H_ #define CORE_FXGE_FONTDATA_CHROMEFONTDATA_CHROMEFONTDATA_H_ -#ifdef __cplusplus -extern "C" { -#endif - extern const unsigned char g_FoxitFixedItalicFontData[18746]; extern const unsigned char g_FoxitFixedFontData[17597]; extern const unsigned char g_FoxitSansItalicFontData[16339]; @@ -28,8 +24,4 @@ extern const unsigned char g_FoxitDingbatsFontData[29513]; extern const unsigned char g_FoxitSerifMMFontData[113417]; extern const unsigned char g_FoxitSansMMFontData[66919]; -#ifdef __cplusplus -} // extern "C" -#endif - #endif // CORE_FXGE_FONTDATA_CHROMEFONTDATA_CHROMEFONTDATA_H_ diff --git a/core/fxge/fx_ge_fontmap.cpp b/core/fxge/fx_ge_fontmap.cpp index 58b00f5ec9..a3c9516b2b 100644 --- a/core/fxge/fx_ge_fontmap.cpp +++ b/core/fxge/fx_ge_fontmap.cpp @@ -64,14 +64,6 @@ int SystemFontInfoIface::GetFaceIndex(void* hFont) { return 0; } -extern "C" { -unsigned long _FTStreamRead(FXFT_Stream stream, - unsigned long offset, - unsigned char* buffer, - unsigned long count); -void _FTStreamClose(FXFT_Stream stream); -}; - #if _FX_OS_ == _FX_OS_ANDROID_ std::unique_ptr SystemFontInfoIface::CreateDefault( const char** pUnused) { -- cgit v1.2.3