diff options
| author | Brian Paul <brianp@vmware.com> | 2009-09-09 09:00:58 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-09-09 09:00:58 -0600 |
| commit | 7bf63473623e01933adc0e8f4464eda8f2860564 (patch) | |
| tree | 4cfb1b611c999c4b158e6809ee78a02e4d7698b5 /src/gallium/auxiliary/util/u_time.h | |
| parent | 94a8157ef6bf6695cdc66325c9a7698e64f3e37e (diff) | |
| parent | 0c309bb494b6ee1c403442d1207743f749f95b6e (diff) | |
Merge branch 'mesa_7_6_branch'
Diffstat (limited to 'src/gallium/auxiliary/util/u_time.h')
| -rw-r--r-- | src/gallium/auxiliary/util/u_time.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/util/u_time.h b/src/gallium/auxiliary/util/u_time.h index 7a5c54d9b2..0ce1cc4a34 100644 --- a/src/gallium/auxiliary/util/u_time.h +++ b/src/gallium/auxiliary/util/u_time.h @@ -43,6 +43,11 @@ #include <unistd.h> /* usleep */ #endif +#if defined(PIPE_OS_HAIKU) +#include <sys/time.h> /* timeval */ +#include <unistd.h> +#endif + #include "pipe/p_compiler.h" @@ -58,7 +63,7 @@ extern "C" { */ struct util_time { -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) +#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU) struct timeval tv; #else int64_t counter; @@ -89,7 +94,7 @@ util_time_timeout(const struct util_time *start, const struct util_time *end, const struct util_time *curr); -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) +#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_HAIKU) #define util_time_sleep usleep #else void |