diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-05-13 16:30:58 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-05-13 16:30:58 +0000 |
| commit | a74d707cb7a42be692243196856fc21b2ee9b4c6 (patch) | |
| tree | b2cec47f856873a30aebe37ab3b1d30cc9382feb /libavutil | |
| parent | 299ac811ba19708115c5f2051c5048406fe954b5 (diff) | |
| download | ffmpeg-a74d707cb7a42be692243196856fc21b2ee9b4c6.tar.gz | |
av_alias is an attribute and belongs to attributes.h
also attributes.h is public and external api and can thus not depend
on configure tested compiler support thus this part is removed. A
different solution must be found if this breaks for some compiler
which i hope it does not.
Originally committed as revision 23115 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/attributes.h | 8 | ||||
| -rw-r--r-- | libavutil/internal.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libavutil/attributes.h b/libavutil/attributes.h index da45234c6a..a95bb02e89 100644 --- a/libavutil/attributes.h +++ b/libavutil/attributes.h @@ -96,6 +96,14 @@ #endif #endif +#ifndef av_alias +#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(3,3) +# define av_alias __attribute__((may_alias)) +#else +# define av_alias +#endif +#endif + #ifndef av_uninit #if defined(__GNUC__) && !defined(__ICC) # define av_uninit(x) x=x diff --git a/libavutil/internal.h b/libavutil/internal.h index 70cf2ffef9..2faafc9af1 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -54,14 +54,6 @@ #endif #endif -#ifndef av_alias -#if HAVE_ATTRIBUTE_MAY_ALIAS && (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(3,3) -# define av_alias __attribute__((may_alias)) -#else -# define av_alias -#endif -#endif - #ifndef INT16_MIN #define INT16_MIN (-0x7fff - 1) #endif |