diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-02 08:46:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-02 08:46:10 (GMT) |
| commit | c5655e2f5a7723b89d556aeefd8ddcc456314386 (patch) | |
| tree | 4ebda08985c126dba9900dacb7d7120a0f2162c4 | |
| parent | d3bec2099da5182bfb46ce9dd05d6c67efab213c (diff) | |
| parent | 542a6e7f1e0bd3b734927ffa92fe0683dec0a559 (diff) | |
| download | Qt-c5655e2f5a7723b89d556aeefd8ddcc456314386.zip Qt-c5655e2f5a7723b89d556aeefd8ddcc456314386.tar.gz Qt-c5655e2f5a7723b89d556aeefd8ddcc456314386.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team:
Compilation fix for WinCE
| -rw-r--r-- | src/3rdparty/zlib/zconf.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/zlib/zconf.h b/src/3rdparty/zlib/zconf.h index 02ce56c..0105ca4 100644 --- a/src/3rdparty/zlib/zconf.h +++ b/src/3rdparty/zlib/zconf.h @@ -360,7 +360,7 @@ typedef uLong FAR uLongf; # define Z_HAVE_UNISTD_H #endif -#ifdef STDC +#if defined(STDC) && !defined(_WIN32_WCE) # include <sys/types.h> /* for off_t */ #endif |