Browse Source

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
tags/v0.6
Diego Biurrun 16 years ago
parent
commit
75af07495a
2 changed files with 4 additions and 2 deletions
  1. +0
    -1
      configure
  2. +4
    -1
      libavutil/common.h

+ 0
- 1
configure View File

@@ -2655,7 +2655,6 @@ print_config CONFIG_ $TMPH config.mak $CONFIG_LIST \
echo "#define restrict $_restrict" >> $TMPH echo "#define restrict $_restrict" >> $TMPH


if enabled small; then if enabled small; then
echo "#undef av_always_inline" >> $TMPH
echo "#define av_always_inline" >> $TMPH echo "#define av_always_inline" >> $TMPH
fi fi




+ 4
- 1
libavutil/common.h View File

@@ -35,6 +35,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>


#ifdef HAVE_AV_CONFIG_H
#include "config.h"
#endif

#ifdef __GNUC__ #ifdef __GNUC__
# define AV_GCC_VERSION_AT_LEAST(x,y) (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y) # define AV_GCC_VERSION_AT_LEAST(x,y) (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y)
#else #else
@@ -280,7 +284,6 @@ static inline av_const float av_clipf(float a, float amin, float amax)
#include "mem.h" #include "mem.h"


#ifdef HAVE_AV_CONFIG_H #ifdef HAVE_AV_CONFIG_H
# include "config.h"
# include "internal.h" # include "internal.h"
#endif /* HAVE_AV_CONFIG_H */ #endif /* HAVE_AV_CONFIG_H */




Loading…
Cancel
Save