shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

[errors] Refine the macro logic surrounding `FT_Error_String'.

* include/freetype/fterrors.h (FT_INCLUDE_ERR_PROTOS,
FT_ERR_PROTOS_DEFINED): Undefine `FT_INCLUDE_ERR_PROTOS' after
checking it and introduce a new macro that takes proper care of
multiple-inclusion protection.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,12 @@

+2018-08-31  Armin Hasitzka  <[email protected]>

+

+	[errors] Refine the macro logic surrounding `FT_Error_String'.

+

+	* include/freetype/fterrors.h (FT_INCLUDE_ERR_PROTOS,

+	FT_ERR_PROTOS_DEFINED): Undefine `FT_INCLUDE_ERR_PROTOS' after

+	checking it and introduce a new macro that takes proper care of

+	multiple-inclusion protection.

+

 2018-08-31  Werner Lemberg  <[email protected]>

 	* src/base/ftdebug.c (FT_Throw): Restore missing `FT_UNUSED' calls.

--- a/include/freetype/fterrors.h

+++ b/include/freetype/fterrors.h

@@ -230,9 +230,18 @@

 #undef FT_ERR_PREFIX

 #endif

+  /* FT_INCLUDE_ERR_PROTOS:  Control if function prototypes should be       */

+  /*                         included with `#include FT_ERRORS_H'.  This is */

+  /*                         only true where `FT_ERRORDEF' is undefined.    */

+  /* FT_ERR_PROTOS_DEFINED:  Actual multiple-inclusion protection of        */

+  /*                         `fterrors.h'.                                  */

 #ifdef FT_INCLUDE_ERR_PROTOS

+#undef FT_INCLUDE_ERR_PROTOS

+#ifndef FT_ERR_PROTOS_DEFINED

+#define FT_ERR_PROTOS_DEFINED

+

   /**************************************************************************

    *

    * @function:

@@ -263,6 +272,8 @@

   FT_EXPORT( const char* )

   FT_Error_String( FT_Error  error_code );

+

+#endif /* FT_ERR_PROTOS_DEFINED */

 #endif /* FT_INCLUDE_ERR_PROTOS */