diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-08-21 05:21:25 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-21 05:21:25 (GMT) |
| commit | 5365c1cdf1e79b60f913f8fba2b5a25058d65b5c (patch) | |
| tree | d80717bf04339f767b92b5cc15c8d905eb3265af /src/3rdparty/harfbuzz | |
| parent | b0743dd4e6f72108ac1fd989a418969fd241335d (diff) | |
| download | Qt-5365c1cdf1e79b60f913f8fba2b5a25058d65b5c.zip Qt-5365c1cdf1e79b60f913f8fba2b5a25058d65b5c.tar.gz Qt-5365c1cdf1e79b60f913f8fba2b5a25058d65b5c.tar.bz2 | |
Revert "Hackish workaroung to Open C / C++ defect when intermixing standard"
This reverts commit 4dd03abdfbcc1af3075b30165e19ee63fe8051f4. And changes
stl.prf slightly to get the Qt libs compiled again without reverted hack.
Conflicts:
src/gui/painting/qblackraster.c
Diffstat (limited to 'src/3rdparty/harfbuzz')
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-global.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-global.h b/src/3rdparty/harfbuzz/src/harfbuzz-global.h index 393cc7b..d4e6b46 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-global.h +++ b/src/3rdparty/harfbuzz/src/harfbuzz-global.h @@ -28,13 +28,7 @@ #ifndef HARFBUZZ_GLOBAL_H #define HARFBUZZ_GLOBAL_H -// Bug in stdlib.h, see more information from fixed_stdlib.h -#if (defined __SYMBIAN32__ && !defined __cplusplus) -#include <fixed_stdlib.h> -#else #include <stdlib.h> -#endif // defined __SYMBIAN32__ && !defined __cplusplus - #include <string.h> #ifdef __cplusplus |