Mercurial > libavutil.hg
changeset 978:009d2ce554b2 libavutil
Remove macro duplication between common.h and intmath.h
| author | mru |
|---|---|
| date | Wed, 07 Jul 2010 17:27:43 +0000 |
| parents | 2cbad2391250 |
| children | a3c26f53e6fa |
| files | common.h intmath.h |
| diffstat | 2 files changed, 14 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/common.h Wed Jul 07 17:27:39 2010 +0000 +++ b/common.h Wed Jul 07 17:27:43 2010 +0000 @@ -90,12 +90,8 @@ # include "intmath.h" #endif -#ifndef av_log2 -# define av_log2 av_log2_c -#endif -#ifndef av_log2_16bit -# define av_log2_16bit av_log2_16bit_c -#endif +/* Pull in unguarded fallback defines at the end of this file. */ +#include "common.h" /** * Clip a signed integer value into the amin-amax range. @@ -312,3 +308,15 @@ #endif /* HAVE_AV_CONFIG_H */ #endif /* AVUTIL_COMMON_H */ + +/* + * The following definitions are outside the multiple inclusion guard + * to ensure they are immediately available in intmath.h. + */ + +#ifndef av_log2 +# define av_log2 av_log2_c +#endif +#ifndef av_log2_16bit +# define av_log2_16bit av_log2_16bit_c +#endif
--- a/intmath.h Wed Jul 07 17:27:39 2010 +0000 +++ b/intmath.h Wed Jul 07 17:27:43 2010 +0000 @@ -52,22 +52,8 @@ # endif #endif /* FASTDIV */ -/* - * Get definition of av_log2_c from common.h. In the event we got - * here through common.h including this file, including it again will - * be a no-op due to multi-inclusion guards, so we must duplicate the - * fallback defines here. - */ - #include "common.h" -#ifndef av_log2 -# define av_log2 av_log2_c -#endif -#ifndef av_log2_16bit -# define av_log2_16bit av_log2_16bit_c -#endif - extern const uint8_t ff_sqrt_tab[256]; static inline av_const unsigned int ff_sqrt(unsigned int a)