summaryrefslogtreecommitdiff
path: root/core/src/fpdfapi/fpdf_font
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-05-28 13:23:12 -0700
committerTom Sepez <tsepez@chromium.org>2015-05-28 13:23:12 -0700
commit19922bbc0d62b81e0fdd6a01da39e9b875c53c68 (patch)
treea5976a2c761d4eb6478582f7a65640ca021343a9 /core/src/fpdfapi/fpdf_font
parent18e5b4b41dc622d4601be538934272678beb7069 (diff)
downloadpdfium-19922bbc0d62b81e0fdd6a01da39e9b875c53c68.tar.xz
Merge to XFA: Fix ALL the include guards.
Original Review URL: https://codereview.chromium.org/1160443004 TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1162013003
Diffstat (limited to 'core/src/fpdfapi/fpdf_font')
-rw-r--r--core/src/fpdfapi/fpdf_font/common.h8
-rw-r--r--core/src/fpdfapi/fpdf_font/font_int.h4
-rw-r--r--core/src/fpdfapi/fpdf_font/ttgsubtable.h8
3 files changed, 14 insertions, 6 deletions
diff --git a/core/src/fpdfapi/fpdf_font/common.h b/core/src/fpdfapi/fpdf_font/common.h
index 4b37a44ccc..923a394662 100644
--- a/core/src/fpdfapi/fpdf_font/common.h
+++ b/core/src/fpdfapi/fpdf_font/common.h
@@ -4,8 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef COMMON_H
-#define COMMON_H
+#ifndef CORE_SRC_FPDFAPI_FPDF_FONT_COMMON_H_
+#define CORE_SRC_FPDFAPI_FPDF_FONT_COMMON_H_
+
typedef signed char TT_int8_t;
typedef unsigned char TT_uint8_t;
typedef signed short TT_int16_t;
@@ -14,4 +15,5 @@ typedef FX_INT32 TT_int32_t;
typedef FX_DWORD TT_uint32_t;
typedef FX_INT64 TT_int64_t;
typedef FX_UINT64 TT_uint64_t;
-#endif
+
+#endif // CORE_SRC_FPDFAPI_FPDF_FONT_COMMON_H_
diff --git a/core/src/fpdfapi/fpdf_font/font_int.h b/core/src/fpdfapi/fpdf_font/font_int.h
index 56454286df..697ccffafd 100644
--- a/core/src/fpdfapi/fpdf_font/font_int.h
+++ b/core/src/fpdfapi/fpdf_font/font_int.h
@@ -3,6 +3,8 @@
// found in the LICENSE file.
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#ifndef CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_
+#define CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_
typedef void* FXFT_Library;
class CPDF_CMapManager
@@ -170,3 +172,5 @@ public:
CPDF_FontCharMap(CPDF_Font* pFont);
CPDF_Font* m_pFont;
};
+
+#endif // CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_
diff --git a/core/src/fpdfapi/fpdf_font/ttgsubtable.h b/core/src/fpdfapi/fpdf_font/ttgsubtable.h
index d231c13ca2..adfff6756a 100644
--- a/core/src/fpdfapi/fpdf_font/ttgsubtable.h
+++ b/core/src/fpdfapi/fpdf_font/ttgsubtable.h
@@ -4,11 +4,13 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef TTGSUBTable_H
-#define TTGSUBTable_H
+#ifndef CORE_SRC_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_
+#define CORE_SRC_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_
+
#include "../../../include/fxge/fx_freetype.h"
#include "../../../include/fxcrt/fx_basic.h"
#include "common.h"
+
class CFX_GlyphMap
{
public:
@@ -420,5 +422,5 @@ public:
private:
~CFX_GSUBTable() { }
};
-#endif
+#endif // CORE_SRC_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_