minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

Still handle `__FTERRORS_H__'. 

We need this for backwards compatibility.

Problem reported by John Emmas <johne53@tiscali.co.uk>.

* include/freetype/fterrors.h: Fix inclusion guard so that
undefining either `FTERRORS_H_' or `__FTERRORS_H__' works as
expected.
This commit is contained in:
Werner Lemberg 2016-01-20 21:10:41 +01:00
parent 1409b3e0aa
commit 24fbed052f
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2016-01-20 Werner Lemberg <wl@gnu.org>
Still handle `__FTERRORS_H__'.
We need this for backwards compatibility.
Problem reported by John Emmas <johne53@tiscali.co.uk>.
* include/freetype/fterrors.h: Fix inclusion guard so that
undefining either `FTERRORS_H_' or `__FTERRORS_H__' works as
expected.
2016-01-19 Werner Lemberg <wl@gnu.org>
[autofit] Fix handling of default script.

14
include/freetype/fterrors.h
View File

@ -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 */