diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-07-30 12:09:22 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-07-31 08:29:14 (GMT) |
| commit | 919ac1291c6e7d163b58679eae691f866b40f71b (patch) | |
| tree | 32ab30f3cd95705c28b6d3cb6d2df75830865139 | |
| parent | 65f6a08ba7d26405a9de683ea0806b400ba8b26d (diff) | |
| download | Qt-919ac1291c6e7d163b58679eae691f866b40f71b.zip Qt-919ac1291c6e7d163b58679eae691f866b40f71b.tar.gz Qt-919ac1291c6e7d163b58679eae691f866b40f71b.tar.bz2 | |
Compile on HP-UXi
There is no monotonic clock support on HP-UXi at all, and the
_POSIX_MONOTONIC_CLOCK macro is not defined at all (not even to
-1). We handle this in the event dispatcher, but not in
qcore_unix.cpp. Since the monotonic clock time code has moved, the
define of _POSIX_MONOTONIC_CLOCK to -1 should also move.
Reviewed-by: thiago
| -rw-r--r-- | src/corelib/kernel/qcore_unix_p.h | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_unix_p.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h index dceb73a..69ebb05 100644 --- a/src/corelib/kernel/qcore_unix_p.h +++ b/src/corelib/kernel/qcore_unix_p.h @@ -323,6 +323,10 @@ static inline pid_t qt_safe_waitpid(pid_t pid, int *status, int options) #endif // Q_OS_VXWORKS +#if !defined(_POSIX_MONOTONIC_CLOCK) +# define _POSIX_MONOTONIC_CLOCK -1 +#endif + bool qt_gettime_is_monotonic(); timeval qt_gettime(); Q_CORE_EXPORT int qt_safe_select(int nfds, fd_set *fdread, fd_set *fdwrite, fd_set *fdexcept, diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h index 9c67c70..5e016d3 100644 --- a/src/corelib/kernel/qeventdispatcher_unix_p.h +++ b/src/corelib/kernel/qeventdispatcher_unix_p.h @@ -69,9 +69,6 @@ #endif QT_BEGIN_NAMESPACE -#if !defined(_POSIX_MONOTONIC_CLOCK) -# define _POSIX_MONOTONIC_CLOCK -1 -#endif // internal timer info struct QTimerInfo { |