rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove `FT_KEEP_ERR_PREFIX'. 

The idea is to always have FT_ERR_PREFIX available internally.

* include/freetype/fterrors.h: Use FT2_BUILD_LIBRARY to guard
undefinition of FT_ERR_PREFIX

* src/gxvalid/gxverror.h, src/otvalid/otverror.h,
src/sfnt/sferrors.h: Updated.
This commit is contained in:
Werner Lemberg 2013-03-12 11:42:20 +01:00
parent c879f24562
commit dbc6e3f192
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2013-03-12 Werner Lemberg <wl@gnu.org>
Remove `FT_KEEP_ERR_PREFIX'.
The idea is to always have FT_ERR_PREFIX available internally.
* include/freetype/fterrors.h: Use FT2_BUILD_LIBRARY to guard
undefinition of FT_ERR_PREFIX
* src/gxvalid/gxverror.h, src/otvalid/otverror.h,
src/sfnt/sferrors.h: Updated.
2013-03-11 Werner Lemberg <wl@gnu.org>
[gxvalid] Fix module error.

8
include/freetype/fterrors.h
View File

@ -4,7 +4,7 @@
/* */
/* FreeType error code handling (specification). */
/* */
/* Copyright 1996-2001, 2002, 2004, 2007 by */
/* Copyright 1996-2002, 2004, 2007, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -194,11 +194,9 @@
#undef FT_NEED_EXTERN_C
#undef FT_ERR_BASE
/* FT_KEEP_ERR_PREFIX is needed for ftvalid.h */
#ifndef FT_KEEP_ERR_PREFIX
/* FT_ERR_PREFIX is needed internally */
#ifndef FT2_BUILD_LIBRARY
#undef FT_ERR_PREFIX
#else
#undef FT_KEEP_ERR_PREFIX
#endif
#endif /* __FTERRORS_H__ */

2
src/gxvalid/gxverror.h
View File

@ -43,8 +43,6 @@
#define FT_ERR_PREFIX GXV_Err_
#define FT_ERR_BASE FT_Mod_Err_GXvalid
#define FT_KEEP_ERR_PREFIX
#include FT_ERRORS_H
#endif /* __GXVERROR_H__ */

4
src/otvalid/otverror.h
View File

@ -4,7 +4,7 @@
/* */
/* OpenType validation module error codes (specification only). */
/* */
/* Copyright 2004, 2005, 2012 by */
/* Copyright 2004, 2005, 2012, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -34,8 +34,6 @@
#define FT_ERR_PREFIX OTV_Err_
#define FT_ERR_BASE FT_Mod_Err_OTvalid
#define FT_KEEP_ERR_PREFIX
#include FT_ERRORS_H
#endif /* __OTVERROR_H__ */

4
src/sfnt/sferrors.h
View File

@ -4,7 +4,7 @@
/* */
/* SFNT error codes (specification only). */
/* */
/* Copyright 2001, 2004, 2012 by */
/* Copyright 2001, 2004, 2012, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -33,8 +33,6 @@
#define FT_ERR_PREFIX SFNT_Err_
#define FT_ERR_BASE FT_Mod_Err_SFNT
#define FT_KEEP_ERR_PREFIX
#include FT_ERRORS_H
#endif /* __SFERRORS_H__ */