[FFmpeg-cvslog] r19553 - in trunk: configure libavutil/common.h

[diego]

Author: diego
Date: Thu Jul 30 23:58:43 2009
New Revision: 19553

Log:
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.

Modified:
   trunk/configure
   trunk/libavutil/common.h

Modified: trunk/configure
==============================================================================
--- trunk/configure	Thu Jul 30 23:54:50 2009	(r19552)
+++ trunk/configure	Thu Jul 30 23:58:43 2009	(r19553)
@@ -2655,7 +2655,6 @@ print_config CONFIG_ $TMPH config.mak $C
 echo "#define restrict $_restrict" >> $TMPH
 
 if enabled small; then
-    echo "#undef av_always_inline"  >> $TMPH
     echo "#define av_always_inline"  >> $TMPH
 fi
 

Modified: trunk/libavutil/common.h
==============================================================================
--- trunk/libavutil/common.h	Thu Jul 30 23:54:50 2009	(r19552)
+++ trunk/libavutil/common.h	Thu Jul 30 23:58:43 2009	(r19553)
@@ -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(fl
 #include "mem.h"
 
 #ifdef HAVE_AV_CONFIG_H
-#    include "config.h"
 #    include "internal.h"
 #endif /* HAVE_AV_CONFIG_H */