minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

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.
This commit is contained in:
Werner Lemberg 2014-03-22 06:20:54 +01:00
parent f0c471a495
commit d515992587
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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.

11
src/base/ftcalc.c
View File

@ -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 */