ref: 24fbed052fbacb690f62bc4b0abfa29f668a35c2
parent: 1409b3e0aa8b977c4faee52289ff99007e82fe1e
author: Werner Lemberg <[email protected]>
date: Wed Jan 20 16:10:41 EST 2016
Still handle `__FTERRORS_H__'. We need this for backwards compatibility. Problem reported by John Emmas <[email protected]>. * include/freetype/fterrors.h: Fix inclusion guard so that undefining either `FTERRORS_H_' or `__FTERRORS_H__' works as expected.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2016-01-20 Werner Lemberg <[email protected]>
+
+ Still handle `__FTERRORS_H__'.
+
+ We need this for backwards compatibility.
+
+ Problem reported by John Emmas <[email protected]>.
+
+ * include/freetype/fterrors.h: Fix inclusion guard so that
+ undefining either `FTERRORS_H_' or `__FTERRORS_H__' works as
+ expected.
+
2016-01-19 Werner Lemberg <[email protected]>
[autofit] Fix handling of default script.
--- a/include/freetype/fterrors.h
+++ b/include/freetype/fterrors.h
@@ -99,8 +99,18 @@
/* */
-#ifndef FTERRORS_H_
+ /* In previous FreeType versions we used `__FTERRORS_H__'. However, */
+ /* using two successive underscores in a non-system symbol name */
+ /* violates the C (and C++) standard, so it was changed to the */
+ /* current form. In spite of this, we have to make */
+ /* */
+ /* #undefine __FTERRORS_H__ */
+ /* */
+ /* work for backwards compatibility. */
+ /* */
+#if !( defined( FTERRORS_H_ ) && defined ( __FTERRORS_H__ ) )
#define FTERRORS_H_
+#define __FTERRORS_H__
/* include module base error codes */
@@ -210,7 +220,7 @@
#undef FT_ERR_PREFIX
#endif
-#endif /* FTERRORS_H_ */
+#endif /* !(FTERRORS_H_ && __FTERRORS_H__) */
/* END */