forked from minhngoc25a/freetype2
changed the definition of FT_CALLBACK_DEF
This commit is contained in:
parent
dee781342b
commit
f77581f642
|
@ -1,5 +1,8 @@
|
||||||
2001-06-27 David Turner <david@freetype.org>
|
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
|
* include/freetype/ftconfig.h, src/*/*.c: changed the definition and
|
||||||
uses of the FT_CALLBACK_DEF macro in order to support 16-bit compilers
|
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 */
|
/* FT_CALLBACK_TABLE_DEF is used to _define_ a constant variable */
|
||||||
/* that contains pointers to callback functions. */
|
/* 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"
|
#ifndef FT_CALLBACK_TABLE
|
||||||
#define FT_CALLBACK_TABLE extern "C"
|
# ifdef __cplusplus
|
||||||
#define FT_CALLBACK_TABLE_DEF extern "C"
|
# define FT_CALLBACK_TABLE extern "C"
|
||||||
|
# define FT_CALLBACK_TABLE_DEF extern "C"
|
||||||
#else
|
# else
|
||||||
|
# define FT_CALLBACK_TABLE extern
|
||||||
#define FT_CALLBACK_DEF static
|
# define FT_CALLBACK_TABLE_DEF /* nothing */
|
||||||
#define FT_CALLBACK_TABLE extern
|
# endif
|
||||||
#define FT_CALLBACK_TABLE_DEF /* nothing */
|
#endif
|
||||||
|
|
||||||
#endif /* __cplusplus */
|
|
||||||
|
|
||||||
|
|
||||||
FT_END_HEADER
|
FT_END_HEADER
|
||||||
|
|
Loading…
Reference in New Issue