Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1563)

Unified Diff: include/freetype/fterrors.h

Issue 23555005: Update freetype to the latest version of Android external/freetype (Closed) Base URL: https://chromium.googlesource.com/chromium/src/third_party/freetype.git@master
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/freetype/fterrdef.h ('k') | include/freetype/ftgasp.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/freetype/fterrors.h
diff --git a/include/freetype/fterrors.h b/include/freetype/fterrors.h
index 6600dadd0df5cb6e0795398dde973bba31348902..a54699f87f2f3bdf2b9e0d1b4c807ff049a92ca7 100644
--- a/include/freetype/fterrors.h
+++ b/include/freetype/fterrors.h
@@ -192,12 +192,13 @@
#undef FT_NOERRORDEF_
#undef FT_NEED_EXTERN_C
-#undef FT_ERR_CONCAT
#undef FT_ERR_BASE
/* FT_KEEP_ERR_PREFIX is needed for ftvalid.h */
#ifndef FT_KEEP_ERR_PREFIX
#undef FT_ERR_PREFIX
+#else
+#undef FT_KEEP_ERR_PREFIX
#endif
#endif /* __FTERRORS_H__ */
« no previous file with comments | « include/freetype/fterrdef.h ('k') | include/freetype/ftgasp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698