diff options
| author | Colin Guthrie <pulse@colin.guthr.ie> | 2008-08-22 10:56:45 +0100 |
|---|---|---|
| committer | Colin Guthrie <pulse@colin.guthr.ie> | 2008-08-22 10:56:45 +0100 |
| commit | 4282b726ee57ebae846ce400fd1cae43c4dfb2ae (patch) | |
| tree | 2cb32c3bc52a9b9eab50a6195f3ccb190332f7d8 /src/pulsecore/core-scache.c | |
| parent | bf17dbb101d509e885bf689f4f13f75e4b3ab58d (diff) | |
| parent | dc9b8dce309728b47059b9b44fd3bbd3798667ae (diff) | |
Merge branch 'master' of git://git.0pointer.de/pulseaudio
Diffstat (limited to 'src/pulsecore/core-scache.c')
| -rw-r--r-- | src/pulsecore/core-scache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pulsecore/core-scache.c b/src/pulsecore/core-scache.c index 75fa2ff1..814dff59 100644 --- a/src/pulsecore/core-scache.c +++ b/src/pulsecore/core-scache.c @@ -63,7 +63,7 @@ #define UNLOAD_POLL_TIME 60 -static void timeout_callback(pa_mainloop_api *m, pa_time_event*e, PA_GCC_UNUSED const struct timeval *tv, void *userdata) { +static void timeout_callback(pa_mainloop_api *m, pa_time_event*e, const struct timeval *tv, void *userdata) { pa_core *c = userdata; struct timeval ntv; @@ -282,7 +282,7 @@ int pa_scache_remove_item(pa_core *c, const char *name) { return 0; } -static void free_cb(void *p, PA_GCC_UNUSED void *userdata) { +static void free_cb(void *p, void *userdata) { pa_scache_entry *e = p; pa_assert(e); |