From d515992587ca2db825158535ba02252a9f0bdb29 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 22 Mar 2014 06:20:54 +0100 Subject: [PATCH] Another revert for the change from 2014-03-18. Problem reported by Nikolaus Waxweiler . * src/base/ftcalc.c (FT_MulFix): Ensure that an `FT_MulFix' symbol gets always exported. --- ChangeLog | 9 +++++++++ src/base/ftcalc.c | 11 +++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 50d8b0aea..1954f3dd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2014-03-22 Werner Lemberg + + Another revert for the change from 2014-03-18. + + Problem reported by Nikolaus Waxweiler . + + * src/base/ftcalc.c (FT_MulFix): Ensure that an `FT_MulFix' symbol + gets always exported. + 2014-03-20 Werner Lemberg CMakeLists.txt: Another fix for include directories. diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c index 654bef295..6e655832f 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 */