diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2015-03-19 17:34:42 +0400 |
|---|---|---|
| committer | Konstantin Ritt <ritt.ks@gmail.com> | 2015-03-20 13:42:29 +0000 |
| commit | 2eaf0cf8fd6e7c290497fedb08134a89e7b49b1d (patch) | |
| tree | 0a4f7bf528e87d0b0a71ce7fccf702b87f4cdec1 /src/3rdparty/freetype/src/gzip/zlib.h | |
| parent | 77c518a50334d4dcf2476a4f39edc1e3990c7f0b (diff) | |
Update bundled FreeType to 2.5.5
Removed everything, imported with help of import_from_tarball.sh script,
and then added a pre-generated builds/unix/ftconfig.h
Task-number: QTBUG-44648
Change-Id: Iea948e41f7761f1580382b3763d04c7a61383382
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/freetype/src/gzip/zlib.h')
| -rw-r--r-- | src/3rdparty/freetype/src/gzip/zlib.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/3rdparty/freetype/src/gzip/zlib.h b/src/3rdparty/freetype/src/gzip/zlib.h index 0f98fdcbd3..50d0d3f146 100644 --- a/src/3rdparty/freetype/src/gzip/zlib.h +++ b/src/3rdparty/freetype/src/gzip/zlib.h @@ -28,11 +28,6 @@ (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). */ -#if defined(__ARMCC__) || defined(__CC_ARM) -/* Ultra ugly hack that convinces RVCT to use the systems zlib */ -#include <stdapis/zlib.h> -#else /* defined(__ARMCC__) || defined(__CC_ARM) */ - #ifndef _ZLIB_H #define _ZLIB_H @@ -833,5 +828,3 @@ ZEXTERN(int) inflateInit2_ OF((z_streamp strm, int windowBits, #endif #endif /* _ZLIB_H */ - -#endif /* defined(__ARMCC__) || defined(__CC_ARM) */ |