Mercurial > libavformat.hg
changeset 3249:bda0941921fe libavformat
Avoid using reserved __names.
| author | michael |
|---|---|
| date | Thu, 24 Apr 2008 23:21:58 +0000 |
| parents | 7fe0c156ed74 |
| children | 9c5e50e5eac0 |
| files | avformat.h cutils.c |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/avformat.h Thu Apr 24 23:09:28 2008 +0000 +++ b/avformat.h Thu Apr 24 23:21:58 2008 +0000 @@ -983,7 +983,7 @@ #ifdef HAVE_AV_CONFIG_H -void __dynarray_add(unsigned long **tab_ptr, int *nb_ptr, unsigned long elem); +void ff_dynarray_add(unsigned long **tab_ptr, int *nb_ptr, unsigned long elem); #ifdef __GNUC__ #define dynarray_add(tab, nb_ptr, elem)\ @@ -991,12 +991,12 @@ typeof(tab) _tab = (tab);\ typeof(elem) _elem = (elem);\ (void)sizeof(**_tab == _elem); /* check that types are compatible */\ - __dynarray_add((unsigned long **)_tab, nb_ptr, (unsigned long)_elem);\ + ff_dynarray_add((unsigned long **)_tab, nb_ptr, (unsigned long)_elem);\ } while(0) #else #define dynarray_add(tab, nb_ptr, elem)\ do {\ - __dynarray_add((unsigned long **)(tab), nb_ptr, (unsigned long)(elem));\ + ff_dynarray_add((unsigned long **)(tab), nb_ptr, (unsigned long)(elem));\ } while(0) #endif
--- a/cutils.c Thu Apr 24 23:09:28 2008 +0000 +++ b/cutils.c Thu Apr 24 23:21:58 2008 +0000 @@ -21,7 +21,7 @@ #include "avformat.h" /* add one element to a dynamic array */ -void __dynarray_add(unsigned long **tab_ptr, int *nb_ptr, unsigned long elem) +void ff_dynarray_add(unsigned long **tab_ptr, int *nb_ptr, unsigned long elem) { int nb, nb_alloc; unsigned long *tab;