diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-12-06 21:27:08 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-12-06 21:27:08 +0000 |
| commit | 5403f8576b6d323d7f1e491664f571dd14e59003 (patch) | |
| tree | c09130eb3ff91750e3f41e662c9b4e647b82acf7 /libavutil | |
| parent | c48e633b9e5186e3d07a636fb97ec160103ee1f2 (diff) | |
| download | ffmpeg-5403f8576b6d323d7f1e491664f571dd14e59003.tar.gz | |
move some __attribute__ macros to internal.h
Originally committed as revision 7238 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/common.h | 24 | ||||
| -rw-r--r-- | libavutil/internal.h | 24 |
2 files changed, 24 insertions, 24 deletions
diff --git a/libavutil/common.h b/libavutil/common.h index 4413129927..3764f765fe 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -47,30 +47,6 @@ # include <math.h> #endif /* HAVE_AV_CONFIG_H */ -#ifndef always_inline -#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define always_inline __attribute__((always_inline)) inline -#else -# define always_inline inline -#endif -#endif - -#ifndef attribute_used -#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define attribute_used __attribute__((used)) -#else -# define attribute_used -#endif -#endif - -#ifndef attribute_unused -#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) -# define attribute_unused __attribute__((unused)) -#else -# define attribute_unused -#endif -#endif - #ifndef attribute_deprecated #if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) # define attribute_deprecated __attribute__((deprecated)) diff --git a/libavutil/internal.h b/libavutil/internal.h index 506e017192..e31e9b213c 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -26,6 +26,30 @@ #ifndef INTERNAL_H #define INTERNAL_H +#ifndef always_inline +#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define always_inline __attribute__((always_inline)) inline +#else +# define always_inline inline +#endif +#endif + +#ifndef attribute_used +#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define attribute_used __attribute__((used)) +#else +# define attribute_used +#endif +#endif + +#ifndef attribute_unused +#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) +# define attribute_unused __attribute__((unused)) +#else +# define attribute_unused +#endif +#endif + #if ( defined(__PIC__) || defined(__pic__) ) && ! defined(PIC) # define PIC #endif |