From f77581f642a245ae87c8257b99394ba0e46a06e3 Mon Sep 17 00:00:00 2001 From: David Turner Date: Wed, 27 Jun 2001 10:54:13 +0000 Subject: [PATCH] changed the definition of FT_CALLBACK_DEF --- ChangeLog | 3 +++ builds/unix/ftconfig.in | 28 ++++++++++++++++------------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c79678f6..59949c92d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2001-06-27 David Turner + * builds/unix/ftconfig.in: changed the definition of the + FT_CALLBACK_DEF macro + * include/freetype/ftconfig.h, src/*/*.c: changed the definition and uses of the FT_CALLBACK_DEF macro in order to support 16-bit compilers diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in index 02db171c8..52d5de72d 100644 --- a/builds/unix/ftconfig.in +++ b/builds/unix/ftconfig.in @@ -231,19 +231,23 @@ FT_BEGIN_HEADER /* FT_CALLBACK_TABLE_DEF is used to _define_ a constant variable */ /* that contains pointers to callback functions. */ /* */ -#ifdef __cplusplus +#ifndef FT_CALLBACK_DEF +# ifdef __cplusplus +# define FT_CALLBACK_DEF(x) extern "C" x +# else +# define FT_CALLBACK_DEF(x) static x +# endif +#endif -#define FT_CALLBACK_DEF extern "C" -#define FT_CALLBACK_TABLE extern "C" -#define FT_CALLBACK_TABLE_DEF extern "C" - -#else - -#define FT_CALLBACK_DEF static -#define FT_CALLBACK_TABLE extern -#define FT_CALLBACK_TABLE_DEF /* nothing */ - -#endif /* __cplusplus */ +#ifndef FT_CALLBACK_TABLE +# ifdef __cplusplus +# define FT_CALLBACK_TABLE extern "C" +# define FT_CALLBACK_TABLE_DEF extern "C" +# else +# define FT_CALLBACK_TABLE extern +# define FT_CALLBACK_TABLE_DEF /* nothing */ +# endif +#endif FT_END_HEADER