projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
[mesa.git]
/
src
/
gallium
/
auxiliary
/
util
/
u_time.h
diff --git
a/src/gallium/auxiliary/util/u_time.h
b/src/gallium/auxiliary/util/u_time.h
index 35d97d16c739758674fd3f18eeb0224e5a8fecb4..a6189a247bbdea8d3197898e937d1d25e3eb896a 100644
(file)
--- a/
src/gallium/auxiliary/util/u_time.h
+++ b/
src/gallium/auxiliary/util/u_time.h
@@
-38,11
+38,16
@@
#include "pipe/p_config.h"
#include "pipe/p_config.h"
-#if defined(PIPE_OS_LINUX)
+#if defined(PIPE_OS_LINUX)
|| defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE)
#include <time.h> /* timeval */
#include <unistd.h> /* usleep */
#endif
#include <time.h> /* timeval */
#include <unistd.h> /* usleep */
#endif
+#if defined(PIPE_OS_HAIKU)
+#include <sys/time.h> /* timeval */
+#include <unistd.h>
+#endif
+
#include "pipe/p_compiler.h"
#include "pipe/p_compiler.h"
@@
-58,7
+63,7
@@
extern "C" {
*/
struct util_time
{
*/
struct util_time
{
-#if defined(PIPE_OS_LINUX)
+#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;
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);
const struct util_time *end,
const struct util_time *curr);
-#if defined(PIPE_OS_LINUX)
+#if defined(PIPE_OS_LINUX)
|| defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) || defined(PIPE_OS_APPLE) || defined(PIPE_OS_HAIKU)
#define util_time_sleep usleep
#else
void
#define util_time_sleep usleep
#else
void