Revert addition of '#undef av_always_inline' to config.h in the small case.
authorDiego Biurrun <diego@biurrun.de>
Thu, 30 Jul 2009 21:58:43 +0000 (21:58 +0000)
committerDiego Biurrun <diego@biurrun.de>
Thu, 30 Jul 2009 21:58:43 +0000 (21:58 +0000)
Instead, #include config.h at the top of common.h so that av_always_inline
does not get doubly defined.

Originally committed as revision 19553 to svn://svn.ffmpeg.org/ffmpeg/trunk

configure
libavutil/common.h

index 3a47fcd..c9c4816 100755 (executable)
--- a/configure
+++ b/configure
@@ -2655,7 +2655,6 @@ print_config CONFIG_ $TMPH config.mak $CONFIG_LIST       \
 echo "#define restrict $_restrict" >> $TMPH
 
 if enabled small; then
-    echo "#undef av_always_inline"  >> $TMPH
     echo "#define av_always_inline"  >> $TMPH
 fi
 
index 5f47572..47666ab 100644 (file)
 #include <stdlib.h>
 #include <string.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
@@ -280,7 +284,6 @@ static inline av_const float av_clipf(float a, float amin, float amax)
 #include "mem.h"
 
 #ifdef HAVE_AV_CONFIG_H
-#    include "config.h"
 #    include "internal.h"
 #endif /* HAVE_AV_CONFIG_H */