summaryrefslogtreecommitdiff
path: root/third_party/freetype/src/cff/cf2error.h
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2017-03-29 21:02:13 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-03-30 04:15:13 +0000
commit3de5005b3013bc7f9b62bc2153786de90a3cc285 (patch)
tree20a2514fef275a461ae1ac17a14356406f426a63 /third_party/freetype/src/cff/cf2error.h
parent75b11e43c284ff80bf49a3c1a0980353b942ff89 (diff)
downloadpdfium-3de5005b3013bc7f9b62bc2153786de90a3cc285.tar.xz
Upgrade to FreeType 2.7.1.
BUG=pdfium:601 Change-Id: I07756cd208cd2221802ff2d331f316b6618a41e0 Reviewed-on: https://pdfium-review.googlesource.com/3120 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'third_party/freetype/src/cff/cf2error.h')
-rw-r--r--third_party/freetype/src/cff/cf2error.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/third_party/freetype/src/cff/cf2error.h b/third_party/freetype/src/cff/cf2error.h
index 6453ebcb7b..512edd1d21 100644
--- a/third_party/freetype/src/cff/cf2error.h
+++ b/third_party/freetype/src/cff/cf2error.h
@@ -36,13 +36,13 @@
/***************************************************************************/
-#ifndef __CF2ERROR_H__
-#define __CF2ERROR_H__
+#ifndef CF2ERROR_H_
+#define CF2ERROR_H_
#include FT_MODULE_ERRORS_H
-#undef __FTERRORS_H__
+#undef FTERRORS_H_
#undef FT_ERR_PREFIX
#define FT_ERR_PREFIX CF2_Err_
@@ -70,7 +70,7 @@ FT_BEGIN_HEADER
* Upon a function call if the error code is anything other than
* `FT_Err_Ok', which is guaranteed to be zero, we
* will return without altering that error. This will allow the
- * error to propogate and be handled at the appropriate location in
+ * error to propagate and be handled at the appropriate location in
* the code.
*
* This allows a style of code where the error code is initialized
@@ -113,7 +113,7 @@ FT_BEGIN_HEADER
FT_END_HEADER
-#endif /* __CF2ERROR_H__ */
+#endif /* CF2ERROR_H_ */
/* END */