ref: d515992587ca2db825158535ba02252a9f0bdb29
parent: f0c471a495b346982264d22ac539c761b610f467
author: Werner Lemberg <[email protected]>
date: Sat Mar 22 02:20:54 EDT 2014
Another revert for the change from 2014-03-18. Problem reported by Nikolaus Waxweiler <[email protected]>. * src/base/ftcalc.c (FT_MulFix): Ensure that an `FT_MulFix' symbol gets always exported.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-03-22 Werner Lemberg <[email protected]>
+
+ Another revert for the change from 2014-03-18.
+
+ Problem reported by Nikolaus Waxweiler <[email protected]>.
+
+ * src/base/ftcalc.c (FT_MulFix): Ensure that an `FT_MulFix' symbol
+ gets always exported.
+
2014-03-20 Werner Lemberg <[email protected]>
CMakeLists.txt: Another fix for include directories.
--- a/src/base/ftcalc.c
+++ b/src/base/ftcalc.c
@@ -39,6 +39,9 @@
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_OBJECTS_H
+#ifdef FT_MULFIX_INLINED
+#undef FT_MulFix
+#endif
/* we need to emulate a 64-bit data type if a real one isn't available */
@@ -200,8 +203,6 @@
/* documentation is in freetype.h */
-#ifndef FT_MULFIX_INLINED
-
FT_EXPORT_DEF( FT_Long )
FT_MulFix( FT_Long a,
FT_Long b )
@@ -235,9 +236,7 @@
#endif /* FT_MULFIX_ASSEMBLER */
}
-#endif /* FT_MULFIX_INLINED */
-
/* documentation is in freetype.h */
FT_EXPORT_DEF( FT_Long )
@@ -448,8 +447,6 @@
/* documentation is in freetype.h */
-#ifndef FT_MULFIX_INLINED
-
FT_EXPORT_DEF( FT_Long )
FT_MulFix( FT_Long a,
FT_Long b )
@@ -547,8 +544,6 @@
#endif /* 0 */
}
-
-#endif /* FT_MULFIX_INLINED */
/* documentation is in freetype.h */