Commit d515992587ca2db825158535ba02252a9f0bdb29
2014-03-22T06:20:54
Another revert for the change from 2014-03-18. Problem reported by Nikolaus Waxweiler <madigens@gmail.com>. * src/base/ftcalc.c (FT_MulFix): Ensure that an `FT_MulFix' symbol gets always exported.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67
diff --git a/ChangeLog b/ChangeLog
index 50d8b0a..1954f3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-03-22 Werner Lemberg <wl@gnu.org>
+
+ Another revert for the change from 2014-03-18.
+
+ Problem reported by Nikolaus Waxweiler <madigens@gmail.com>.
+
+ * src/base/ftcalc.c (FT_MulFix): Ensure that an `FT_MulFix' symbol
+ gets always exported.
+
2014-03-20 Werner Lemberg <wl@gnu.org>
CMakeLists.txt: Another fix for include directories.
diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c
index 654bef2..6e65583 100644
--- 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,8 +236,6 @@
#endif /* FT_MULFIX_ASSEMBLER */
}
-#endif /* FT_MULFIX_INLINED */
-
/* documentation is in freetype.h */
@@ -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 )
@@ -548,8 +545,6 @@
}
-#endif /* FT_MULFIX_INLINED */
-
/* documentation is in freetype.h */