From bbec226432ec1d42031c493b16d9affb5fa2fb76 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 12 Aug 2012 12:38:39 +0200 Subject: Fix declaration of qt_gettime for Q_DECL_NOTHROW Since the #include wasn't present in the qelapsedtimer_{mac,unix}.cpp files, we did not notice that the declaration missed the macro. Change-Id: I3e4f23b28e127d41b12690cf306f47986be53d89 Reviewed-by: Lars Knoll --- src/corelib/kernel/qcore_unix_p.h | 3 ++- src/corelib/tools/qelapsedtimer_mac.cpp | 1 + src/corelib/tools/qelapsedtimer_unix.cpp | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h index 6ec8e269f8..957c646d80 100644 --- a/src/corelib/kernel/qcore_unix_p.h +++ b/src/corelib/kernel/qcore_unix_p.h @@ -310,7 +310,8 @@ static inline pid_t qt_safe_waitpid(pid_t pid, int *status, int options) # define _POSIX_MONOTONIC_CLOCK -1 #endif -timeval qt_gettime(); // in qelapsedtimer_mac.cpp or qtimestamp_unix.cpp +// in qelapsedtimer_mac.cpp or qtimestamp_unix.cpp +timeval qt_gettime() Q_DECL_NOTHROW; Q_CORE_EXPORT int qt_safe_select(int nfds, fd_set *fdread, fd_set *fdwrite, fd_set *fdexcept, const struct timeval *tv); diff --git a/src/corelib/tools/qelapsedtimer_mac.cpp b/src/corelib/tools/qelapsedtimer_mac.cpp index 73a28c28d0..2aeaaa60f0 100644 --- a/src/corelib/tools/qelapsedtimer_mac.cpp +++ b/src/corelib/tools/qelapsedtimer_mac.cpp @@ -44,6 +44,7 @@ #include #include +#include QT_BEGIN_NAMESPACE diff --git a/src/corelib/tools/qelapsedtimer_unix.cpp b/src/corelib/tools/qelapsedtimer_unix.cpp index 3b2c0ed1f3..d7419aea18 100644 --- a/src/corelib/tools/qelapsedtimer_unix.cpp +++ b/src/corelib/tools/qelapsedtimer_unix.cpp @@ -47,6 +47,8 @@ #include #include +#include "private/qcore_unix_p.h" + #if defined(QT_NO_CLOCK_MONOTONIC) || defined(QT_BOOTSTRAPPED) // turn off the monotonic clock # ifdef _POSIX_MONOTONIC_CLOCK -- cgit v1.2.3