# HG changeset patch # User diego # Date 1232925662 0 # Node ID fb04e2fc189c5fc43a8fcf403227bc826eccac99 # Parent 097c9438d7f49810198bdfae913439f5933fa4c2 Reorganize header #includes: Unconditionally #include standard C headers, group all local #includes together. diff -r 097c9438d7f4 -r fb04e2fc189c common.h --- a/common.h Sun Jan 25 22:59:05 2009 +0000 +++ b/common.h Sun Jan 25 23:21:02 2009 +0000 @@ -26,20 +26,14 @@ #ifndef AVUTIL_COMMON_H #define AVUTIL_COMMON_H +#include +#include #include - -#ifdef HAVE_AV_CONFIG_H -/* only include the following when compiling package */ -# include "config.h" - -# include -# include -# include -# include -# include -# include -# include -#endif /* HAVE_AV_CONFIG_H */ +#include +#include +#include +#include +#include #define AV_GCC_VERSION_AT_LEAST(x,y) (defined(__GNUC__) && (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y)) @@ -99,8 +93,6 @@ #endif #endif -#include "mem.h" - //rounded divison & shift #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b)) /* assume b>0 */ @@ -264,7 +256,10 @@ }\ } +#include "mem.h" + #ifdef HAVE_AV_CONFIG_H +# include "config.h" # include "internal.h" #endif /* HAVE_AV_CONFIG_H */