aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorDiego Pettenò <flameeyes@gmail.com>2008-10-02 20:01:13 +0000
committerGuillaume Poirier <gpoirier@mplayerhq.hu>2008-10-02 20:01:13 +0000
commit72ab9d7f604e3ef0f4f418a072d86602f9d9b10a (patch)
tree70db6d972b8e5441477501c88cf59e79c1ac1669 /libavformat
parent9aa1cfec1a8597f3bd0f9fa564c43a53e42fab25 (diff)
downloadffmpeg-72ab9d7f604e3ef0f4f418a072d86602f9d9b10a.tar.gz
Use __typeof__ instead of GCC-specific typeof keyword.
The typeof keyword is disabled by default when building with -std=c99 as it's a GNU extension. ICC supports the __typeof__ keyword as well as typeof. Patch by Diego 'Flameeyes' Pettenò %flameeyes A gmail P com% Originally committed as revision 15527 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avformat.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index cc8f36a7ab..e11e78813e 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1123,8 +1123,8 @@ void ff_dynarray_add(unsigned long **tab_ptr, int *nb_ptr, unsigned long elem);
#ifdef __GNUC__
#define dynarray_add(tab, nb_ptr, elem)\
do {\
- typeof(tab) _tab = (tab);\
- typeof(elem) _elem = (elem);\
+ __typeof__(tab) _tab = (tab);\
+ __typeof__(elem) _elem = (elem);\
(void)sizeof(**_tab == _elem); /* check that types are compatible */\
ff_dynarray_add((unsigned long **)_tab, nb_ptr, (unsigned long)_elem);\
} while(0)