changeset 761:58d118a78f6d libavutil

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.
author diego
date Thu, 30 Jul 2009 21:58:43 +0000
parents 3412528f4de7
children 839b4855bb03
files common.h
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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 <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 @@
 #include "mem.h"
 
 #ifdef HAVE_AV_CONFIG_H
-#    include "config.h"
 #    include "internal.h"
 #endif /* HAVE_AV_CONFIG_H */