diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-08-12 12:38:39 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-13 22:45:27 +0200 |
| commit | bbec226432ec1d42031c493b16d9affb5fa2fb76 (patch) | |
| tree | 93bcaba014e32c609eb97b6492b081faf5d89ea7 /src/corelib/kernel | |
| parent | 1fc8f1e49b952ea72f75be59a125cbe9e358e26f (diff) | |
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>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qcore_unix_p.h | 3 |
1 files changed, 2 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); |