summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-07-02 14:43:40 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-07-02 14:44:09 (GMT)
commitf30f3e7bdc846baf49ef51721a5b11d31be22cf2 (patch)
tree98154cc37926a73aaccf2a4369c7e24c79c52a4e /src
parentd9b28812d0065227e6f66817cd9bf917dfadb0f0 (diff)
downloadQt-f30f3e7bdc846baf49ef51721a5b11d31be22cf2.zip
Qt-f30f3e7bdc846baf49ef51721a5b11d31be22cf2.tar.gz
Qt-f30f3e7bdc846baf49ef51721a5b11d31be22cf2.tar.bz2
Fix build with MSVC2003: apparently the code path I thought was Unix was also older MSVC
Diffstat (limited to 'src')
-rw-r--r--src/corelib/io/qtemporaryfile.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp
index 2ae4611..b520bee 100644
--- a/src/corelib/io/qtemporaryfile.cpp
+++ b/src/corelib/io/qtemporaryfile.cpp
@@ -61,7 +61,7 @@
#include <ctype.h>
#if defined(Q_OS_UNIX)
-# include "private/qcore_unix_p.h"
+# include "private/qcore_unix_p.h" // overrides QT_OPEN
#endif
#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
@@ -211,9 +211,9 @@ static int _gettemp(char *path, int *doopen, int domkdir, int slen)
if ((*doopen =
QT_OPEN(targetPath.toLocal8Bit(), O_CREAT|O_EXCL|O_RDWR
# else // CE
- // this is Unix
+ // this is Unix or older MSVC
if ((*doopen =
- qt_safe_open(path, QT_OPEN_CREAT|O_EXCL|QT_OPEN_RDWR
+ QT_OPEN(path, QT_OPEN_CREAT|O_EXCL|QT_OPEN_RDWR
# endif
# ifdef QT_LARGEFILE_SUPPORT
|QT_OPEN_LARGEFILE