| Index: core/include/fpdfapi/fpdf_resource.h
|
| diff --git a/core/include/fpdfapi/fpdf_resource.h b/core/include/fpdfapi/fpdf_resource.h
|
| index 4a850969002c495e8ed00e49c842593bfa52bec9..f1ea6b5a23365d2672f580d5e0556a8fadd2d792 100644
|
| --- a/core/include/fpdfapi/fpdf_resource.h
|
| +++ b/core/include/fpdfapi/fpdf_resource.h
|
| @@ -4,14 +4,12 @@
|
|
|
| // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
|
|
|
| -#ifndef _FPDF_RESOURCE_
|
| -#define _FPDF_RESOURCE_
|
| -#ifndef _FPDF_PARSER_
|
| -#include "fpdf_parser.h"
|
| -#endif
|
| -#ifndef _FX_FONT_H_
|
| +#ifndef CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_
|
| +#define CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_
|
| +
|
| #include "../fxge/fx_font.h"
|
| -#endif
|
| +#include "fpdf_parser.h"
|
| +
|
| class CPDF_Font;
|
| class CPDF_Type1Font;
|
| class CPDF_TrueTypeFont;
|
| @@ -946,4 +944,5 @@ private:
|
| CPDF_Dictionary* m_pOC;
|
| CPDF_Dictionary* InitJPEG(FX_LPBYTE pData, FX_DWORD size);
|
| };
|
| -#endif
|
| +
|
| +#endif // CORE_INCLUDE_FPDFAPI_FPDF_RESOURCE_H_
|
|
|