ref: f77581f642a245ae87c8257b99394ba0e46a06e3
parent: dee781342b932b60c0c885d4f493b8246710a34c
author: David Turner <[email protected]>
date: Wed Jun 27 06:54:13 EDT 2001
changed the definition of FT_CALLBACK_DEF
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2001-06-27 David Turner <[email protected]>
+ * 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
--- a/builds/unix/ftconfig.in
+++ b/builds/unix/ftconfig.in
@@ -231,19 +231,23 @@
/* 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