changed the definition of FT_CALLBACK_DEF

BRANCH-2-1-5
David Turner 24 years ago
parent cc40f83ffd
commit a20ad4b9ef
  1. 3
      ChangeLog
  2. 28
      builds/unix/ftconfig.in

@ -1,5 +1,8 @@
2001-06-27 David Turner <david@freetype.org>
* 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

@ -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
#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 */
#ifndef FT_CALLBACK_DEF
# ifdef __cplusplus
# define FT_CALLBACK_DEF(x) extern "C" x
# else
# define FT_CALLBACK_DEF(x) static x
# endif
#endif
#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

Loading…
Cancel
Save