diff options
| author | Fabien Freling <fabien.freling@nokia.com> | 2010-02-12 15:49:38 (GMT) |
|---|---|---|
| committer | Fabien Freling <fabien.freling@nokia.com> | 2010-02-12 15:49:38 (GMT) |
| commit | c04fd421375562f2db8ab89d7bb9509d9b655dd2 (patch) | |
| tree | 411853760626883241748157b8e3dca1b272722f /src/gui/text/qzip.cpp | |
| parent | 441aff9d01a1530d2b187098c7c47bc683116a66 (diff) | |
| parent | 3fb70a8beea1dda58e50831edc5dd9073b899f72 (diff) | |
| download | Qt-c04fd421375562f2db8ab89d7bb9509d9b655dd2.zip Qt-c04fd421375562f2db8ab89d7bb9509d9b655dd2.tar.gz Qt-c04fd421375562f2db8ab89d7bb9509d9b655dd2.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'src/gui/text/qzip.cpp')
| -rw-r--r-- | src/gui/text/qzip.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/text/qzip.cpp b/src/gui/text/qzip.cpp index 2fc1940..d30c996 100644 --- a/src/gui/text/qzip.cpp +++ b/src/gui/text/qzip.cpp @@ -54,10 +54,13 @@ #include <zlib.h> #if defined(Q_OS_WIN) -#undef S_IFREG -#define S_IFREG 0100000 +# undef S_IFREG +# define S_IFREG 0100000 +# ifndef S_IFDIR +# define S_IFDIR 0040000 +# endif # ifndef S_ISDIR -# define S_ISDIR(x) ((x) & 0040000) > 0 +# define S_ISDIR(x) ((x) & S_IFDIR) > 0 # endif # ifndef S_ISREG # define S_ISREG(x) ((x) & 0170000) == S_IFREG |