diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-03-08 21:28:56 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-03-08 21:28:56 +0000 |
| commit | 2791730dbf99f3bbade1eb9eabb49424ce75c0c5 (patch) | |
| tree | e674530b274a9650fa479a6be045fd45e059ffc2 /libavutil/common.h | |
| parent | 94ca624fbcaf0cd3e03ff3529453fd7a8af2c5ed (diff) | |
| download | ffmpeg-2791730dbf99f3bbade1eb9eabb49424ce75c0c5.tar.gz | |
Move gcc attribute macros to new header libavutil/attributes.h
Originally committed as revision 22346 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/common.h')
| -rw-r--r-- | libavutil/common.h | 79 |
1 files changed, 1 insertions, 78 deletions
diff --git a/libavutil/common.h b/libavutil/common.h index 4b757d1ca3..0ba6911f5f 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -34,89 +34,12 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include "attributes.h" #ifdef HAVE_AV_CONFIG_H #include "config.h" #endif -#ifdef __GNUC__ -# define AV_GCC_VERSION_AT_LEAST(x,y) (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y) -#else -# define AV_GCC_VERSION_AT_LEAST(x,y) 0 -#endif - -#ifndef av_always_inline -#if AV_GCC_VERSION_AT_LEAST(3,1) -# define av_always_inline __attribute__((always_inline)) inline -#else -# define av_always_inline inline -#endif -#endif - -#ifndef av_noinline -#if AV_GCC_VERSION_AT_LEAST(3,1) -# define av_noinline __attribute__((noinline)) -#else -# define av_noinline -#endif -#endif - -#ifndef av_pure -#if AV_GCC_VERSION_AT_LEAST(3,1) -# define av_pure __attribute__((pure)) -#else -# define av_pure -#endif -#endif - -#ifndef av_const -#if AV_GCC_VERSION_AT_LEAST(2,6) -# define av_const __attribute__((const)) -#else -# define av_const -#endif -#endif - -#ifndef av_cold -#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,3) -# define av_cold __attribute__((cold)) -#else -# define av_cold -#endif -#endif - -#ifndef av_flatten -#if (!defined(__ICC) || __ICC > 1110) && AV_GCC_VERSION_AT_LEAST(4,1) -# define av_flatten __attribute__((flatten)) -#else -# define av_flatten -#endif -#endif - -#ifndef attribute_deprecated -#if AV_GCC_VERSION_AT_LEAST(3,1) -# define attribute_deprecated __attribute__((deprecated)) -#else -# define attribute_deprecated -#endif -#endif - -#ifndef av_unused -#if defined(__GNUC__) -# define av_unused __attribute__((unused)) -#else -# define av_unused -#endif -#endif - -#ifndef av_uninit -#if defined(__GNUC__) && !defined(__ICC) -# define av_uninit(x) x=x -#else -# define av_uninit(x) x -#endif -#endif - #ifdef HAVE_AV_CONFIG_H # include "intmath.h" #endif |