diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-04-23 12:39:38 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-04-23 12:39:38 +1000 |
| commit | 104ff59585ad1888c8cef5ad9de0e2fdb3f48c21 (patch) | |
| tree | 9128984eef4a90cc6177d336759ce795b835d71f /src/gallium/auxiliary/util/u_time.h | |
| parent | b20acef90695d6e5975f538b6e9cb812b05f0cf6 (diff) | |
| parent | 6fc530ccda2971a5d99a955ad90ae9762238040f (diff) | |
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/auxiliary/util/u_time.h')
| -rw-r--r-- | src/gallium/auxiliary/util/u_time.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/util/u_time.h b/src/gallium/auxiliary/util/u_time.h index 32035cceb5..c8836c137f 100644 --- a/src/gallium/auxiliary/util/u_time.h +++ b/src/gallium/auxiliary/util/u_time.h @@ -77,9 +77,9 @@ util_time_diff(const struct util_time *t1, const struct util_time *t2); /** - * Returns zero when the timeout expires, non zero otherwise. + * Returns non-zero when the timeout expires. */ -int +boolean util_time_timeout(const struct util_time *start, const struct util_time *end, const struct util_time *curr); @@ -87,7 +87,7 @@ util_time_timeout(const struct util_time *start, #ifndef WIN32 #define util_time_sleep usleep #else -int +void util_time_sleep(unsigned usecs); #endif |