38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
From: Dmitry Shachnev <mitya57@debian.org>
|
|
Date: Fri, 5 May 2023 07:44:33 +0000
|
|
Subject: guard UTIME_NOW/UTIME_OMIT usages
|
|
|
|
Forwarded: no
|
|
Last-Update: 2018-02-22
|
|
---
|
|
qmake/library/ioutils.cpp | 2 +-
|
|
src/corelib/io/qfilesystemengine_unix.cpp | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/qmake/library/ioutils.cpp b/qmake/library/ioutils.cpp
|
|
index d217127..6fada00 100644
|
|
--- a/qmake/library/ioutils.cpp
|
|
+++ b/qmake/library/ioutils.cpp
|
|
@@ -228,7 +228,7 @@ bool IoUtils::touchFile(const QString &targetFileName, const QString &referenceF
|
|
*errorString = fL1S("Cannot stat() reference file %1: %2.").arg(referenceFileName, fL1S(strerror(errno)));
|
|
return false;
|
|
}
|
|
-# if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200809L
|
|
+# if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200809L && defined(UTIME_NOW)
|
|
const struct timespec times[2] = { { 0, UTIME_NOW }, st.st_mtim };
|
|
const bool utimeError = utimensat(AT_FDCWD, targetFileName.toLocal8Bit().constData(), times, 0) < 0;
|
|
# else
|
|
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
|
|
index f32bb52..58e06ee 100644
|
|
--- a/src/corelib/io/qfilesystemengine_unix.cpp
|
|
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
|
|
@@ -1595,7 +1595,7 @@ bool QFileSystemEngine::setFileTime(int fd, const QDateTime &newDate, QAbstractF
|
|
return false;
|
|
}
|
|
|
|
-#if QT_CONFIG(futimens)
|
|
+#if QT_CONFIG(futimens) && defined(UTIME_OMIT)
|
|
struct timespec ts[2];
|
|
|
|
ts[0].tv_sec = ts[1].tv_sec = 0;
|