diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qcore_unix_p.h | 3 | ||||
| -rw-r--r-- | src/corelib/tools/qelapsedtimer_mac.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/tools/qelapsedtimer_unix.cpp | 2 |
3 files changed, 5 insertions, 1 deletions
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 <unistd.h> #include <mach/mach_time.h> +#include <private/qcore_unix_p.h> 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 <time.h> #include <unistd.h> +#include "private/qcore_unix_p.h" + #if defined(QT_NO_CLOCK_MONOTONIC) || defined(QT_BOOTSTRAPPED) // turn off the monotonic clock # ifdef _POSIX_MONOTONIC_CLOCK |