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 <lars.knoll@nokia.com>
bb10
parent
1fc8f1e49b
commit
bbec226432
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@
|
|||
#include <unistd.h>
|
||||
|
||||
#include <mach/mach_time.h>
|
||||
#include <private/qcore_unix_p.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue