From 10830e844683c75d96c024450b4b7a624d8d6d8f Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Fri, 10 Feb 2012 11:27:00 +0100 Subject: Fixed zlib build for WEC7. errno in zutil.c is leftover, and not used anymore -> removed. In gzguts.h qfunctions_wince.h are included. To use this header qglobal.h is needed. In qfunctions_wince.h a special define section is added for zlib. Task-number: QTBUG-22507 Change-Id: I78ec78d22e2930a03b349a47ab3a3ad077277c42 Reviewed-by: Miikka Heikkinen Reviewed-by: Friedemann Kleint --- src/corelib/kernel/qfunctions_wince.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/corelib/kernel/qfunctions_wince.h') diff --git a/src/corelib/kernel/qfunctions_wince.h b/src/corelib/kernel/qfunctions_wince.h index f83dad0dde..7cd8ea66a2 100644 --- a/src/corelib/kernel/qfunctions_wince.h +++ b/src/corelib/kernel/qfunctions_wince.h @@ -182,6 +182,16 @@ void qt_wince_rewind( FILE *stream ); int qt_wince___fileno(FILE *); FILE *qt_wince_tmpfile( void ); +//For zlib we need these helper functions, but they break the build when +//set globally, so just set them for zlib use +#ifdef ZLIB_H +#define open qt_wince_open +#define close qt_wince__close +#define lseek qt_wince__lseek +#define read qt_wince__read +#define write qt_wince__write +#endif + int qt_wince__mkdir(const char *dirname); int qt_wince__rmdir(const char *dirname); int qt_wince__access( const char *path, int pmode ); -- cgit v1.2.3