diff options
| author | Lennart Poettering <lennart@poettering.net> | 2007-08-22 00:21:28 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2007-08-22 00:21:28 +0000 |
| commit | 6bfeef18187ff56b92875e2dd926bf32c3a6c720 (patch) | |
| tree | 775e582721c045487d5e0c17de4bfffb12dd9486 | |
| parent | 531cc3cfaffaeac5f46fc808e20711001b8fc1db (diff) | |
rename a few things in a macro to make name collisions less likely
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1686 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rw-r--r-- | src/pulsecore/flist.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/pulsecore/flist.h b/src/pulsecore/flist.h index 69b9c741..daf0fec4 100644 --- a/src/pulsecore/flist.h +++ b/src/pulsecore/flist.h @@ -44,25 +44,25 @@ void* pa_flist_pop(pa_flist*l); /* Please not that the destructor stuff is not really necesary, we do * this just to make valgrind output more useful. */ -#define PA_STATIC_FLIST_DECLARE(name, size, destroy_cb) \ +#define PA_STATIC_FLIST_DECLARE(name, size, free_cb) \ static struct { \ pa_flist *flist; \ pa_once once; \ - } name##_static_flist = { NULL, PA_ONCE_INIT }; \ - static void name##_init(void) { \ - name##_static_flist.flist = pa_flist_new(size); \ + } name##_flist = { NULL, PA_ONCE_INIT }; \ + static void name##_flist_init(void) { \ + name##_flist.flist = pa_flist_new(size); \ } \ - static inline pa_flist* name##_get(void) { \ - pa_run_once(&name##_static_flist.once, name##_init); \ - return name##_static_flist.flist; \ + static inline pa_flist* name##_flist_get(void) { \ + pa_run_once(&name##_flist.once, name##_flist_init); \ + return name##_flist.flist; \ } \ - static void name##_destructor(void) PA_GCC_DESTRUCTOR; \ - static void name##_destructor(void) { \ - if (name##_static_flist.flist) \ - pa_flist_free(name##_static_flist.flist, destroy_cb); \ + static void name##_flist_destructor(void) PA_GCC_DESTRUCTOR; \ + static void name##_flist_destructor(void) { \ + if (name##_flist.flist) \ + pa_flist_free(name##_flist.flist, (free_cb)); \ } \ struct __stupid_useless_struct_to_allow_trailing_semicolon -#define PA_STATIC_FLIST_GET(name) (name##_get()) +#define PA_STATIC_FLIST_GET(name) (name##_flist_get()) #endif |