From 47fd91bb8961377af6c2fe5b075e5812c2980fe1 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Sat, 14 May 2022 17:41:01 +0800 Subject: [PATCH] guard UTIME_NOW/UTIME_OMIT usages Forwarded: no Last-Update: 2018-02-22 Gbp-Pq: Name nonlinux_utime.diff --- 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 d2171274..6fada000 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 231e5cb0..3cbf0324 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;