diff options
| author | Lennart Poettering <lennart@poettering.net> | 2007-10-07 13:54:15 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2007-10-07 13:54:15 +0000 |
| commit | d74fa66f35eda1add73313d60c321f63269b3c56 (patch) | |
| tree | 646988e0a47ca0bf35aa1c60fa724b73cb2f18f3 | |
| parent | 87cc073653f42c4e5237489fdc43fd4cda7e7144 (diff) | |
Fix build; change return value of pa_rtclock_hrtimer() to pa_bool
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1933 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rw-r--r-- | src/pulsecore/rtclock.c | 13 | ||||
| -rw-r--r-- | src/pulsecore/rtclock.h | 4 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/pulsecore/rtclock.c b/src/pulsecore/rtclock.c index 0d983f83..b34e6a41 100644 --- a/src/pulsecore/rtclock.c +++ b/src/pulsecore/rtclock.c @@ -53,12 +53,12 @@ struct timeval *pa_rtclock_get(struct timeval *tv) { #ifdef CLOCK_MONOTONIC if (clock_gettime(CLOCK_MONOTONIC, &ts) >= 0) goto out; -#endif +#endif no_monotonic = 1; } - pa_assert_se(clock_gettime(CLOCK_REALTIME, ts) == 0); + pa_assert_se(clock_gettime(CLOCK_REALTIME, &ts) == 0); out: pa_assert(tv); @@ -75,22 +75,21 @@ out: #endif } -int pa_rtclock_hrtimer(void) { +pa_bool_t pa_rtclock_hrtimer(void) { #ifdef HAVE_CLOCK_GETTIME struct timespec ts; - + #ifdef CLOCK_MONOTONIC if (clock_getres(CLOCK_MONOTONIC, &ts) >= 0) return ts.tv_sec == 0 && ts.tv_nsec <= PA_HRTIMER_THRESHOLD_USEC*1000; -#endif +#endif pa_assert_se(clock_getres(CLOCK_REALTIME, &ts) == 0); return ts.tv_sec == 0 && ts.tv_nsec <= PA_HRTIMER_THRESHOLD_USEC*1000; #else /* HAVE_CLOCK_GETTIME */ - return 0; + return FALSE; #endif } - diff --git a/src/pulsecore/rtclock.h b/src/pulsecore/rtclock.h index 0d232a04..72bbd5e9 100644 --- a/src/pulsecore/rtclock.h +++ b/src/pulsecore/rtclock.h @@ -24,13 +24,15 @@ USA. ***/ +#include <pulsecore/macro.h> + struct timeval; /* Something like pulse/timeval.h but based on CLOCK_MONOTONIC */ struct timeval *pa_rtclock_get(struct timeval *ts); pa_usec_t pa_rtclock_age(const struct timeval *tv); -int pa_rtclock_hrtimer(void); +pa_bool_t pa_rtclock_hrtimer(void); /* timer with a resolution better than this are considered high-resolution */ #define PA_HRTIMER_THRESHOLD_USEC 10 |