ref: dbc6e3f192e237f0d37c8b5fdf4332e90aed6d85
parent: c879f24562cc21bb062fb2faa86633a6c8c2371a
author: Werner Lemberg <[email protected]>
date: Tue Mar 12 07:42:20 EDT 2013
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.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2013-03-12 Werner Lemberg <[email protected]>
+
+ 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 <[email protected]>
[gxvalid] Fix module error.
--- a/include/freetype/fterrors.h
+++ b/include/freetype/fterrors.h
@@ -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__ */
--- a/src/gxvalid/gxverror.h
+++ b/src/gxvalid/gxverror.h
@@ -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__ */
--- a/src/otvalid/otverror.h
+++ b/src/otvalid/otverror.h
@@ -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, */
@@ -33,8 +33,6 @@
#undef FT_ERR_PREFIX
#define FT_ERR_PREFIX OTV_Err_
#define FT_ERR_BASE FT_Mod_Err_OTvalid
-
-#define FT_KEEP_ERR_PREFIX
#include FT_ERRORS_H
--- a/src/sfnt/sferrors.h
+++ b/src/sfnt/sferrors.h
@@ -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, */
@@ -32,8 +32,6 @@
#undef FT_ERR_PREFIX
#define FT_ERR_PREFIX SFNT_Err_
#define FT_ERR_BASE FT_Mod_Err_SFNT
-
-#define FT_KEEP_ERR_PREFIX
#include FT_ERRORS_H