[SCM] libav/experimental: Revert addition of '#undef av_always_inline' to config.h in the small case. Instead, #include config.h at the top of common.h so that av_always_inline does not get doubly defined.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 75af07495adce80b64e8240b6d6efc61ea14265b
Author: Diego Biurrun <diego at biurrun.de>
Date:   Thu Jul 30 21:58:43 2009 +0000

    Revert addition of '#undef av_always_inline' to config.h in the small case.
    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

diff --git a/configure b/configure
index 3a47fcd..c9c4816 100755
--- 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
 
diff --git a/libavutil/common.h b/libavutil/common.h
index 5f47572..47666ab 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -35,6 +35,10 @@
 #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 */
 

-- 
Libav/FFmpeg packaging