diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2013-04-01 18:33:17 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-02 22:28:58 +0200 |
| commit | ef05a7d64f6d0414da9ea02c5d2430fe7c4aac16 (patch) | |
| tree | 5b6904e330376df7b5d88aa8051187293db04880 /src/3rdparty/freetype/builds/unix | |
| parent | 406c8ef6e67da5505c7404a2517a8b4204d7c38a (diff) | |
Apply Qt-specific changes to the bundled FreeType
Change-Id: Ia2e737b513f542c702f24986ec9fcb24b5631e36
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/freetype/builds/unix')
| -rw-r--r-- | src/3rdparty/freetype/builds/unix/ftconfig.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/3rdparty/freetype/builds/unix/ftconfig.h b/src/3rdparty/freetype/builds/unix/ftconfig.h index 2fca16c79c..8bd62f94d5 100644 --- a/src/3rdparty/freetype/builds/unix/ftconfig.h +++ b/src/3rdparty/freetype/builds/unix/ftconfig.h @@ -140,6 +140,13 @@ FT_BEGIN_HEADER #endif /* FT_SIZEOF_LONG == 8 */ +#ifdef FT_CONFIG_OPTION_INLINE_MULFIX +#ifdef FT_MULFIX_ASSEMBLER +#define FT_MULFIX_INLINED FT_MULFIX_ASSEMBLER +#endif +#endif + + #ifdef FT_MAKE_OPTION_SINGLE_OBJECT #define FT_LOCAL( x ) static x |