# HG changeset patch # User diego # Date 1248991123 0 # Node ID 58d118a78f6d0ecad9bc2424eaddcfa2f3e4f830 # Parent 3412528f4de7066e6e0bb72812719715a97660b8 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. diff -r 3412528f4de7 -r 58d118a78f6d common.h --- a/common.h Thu Jul 30 21:21:30 2009 +0000 +++ b/common.h Thu Jul 30 21:58:43 2009 +0000 @@ -35,6 +35,10 @@ #include #include +#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 @@ #include "mem.h" #ifdef HAVE_AV_CONFIG_H -# include "config.h" # include "internal.h" #endif /* HAVE_AV_CONFIG_H */