Mercurial > libavutil.hg

changeset 630:fb04e2fc189c libavutil

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reorganize header #includes: Unconditionally #include standard C headers, group all local #includes together.
author diego
date Sun, 25 Jan 2009 23:21:02 +0000
parents 097c9438d7f4
children f7f8673fbfb0
files common.h
diffstat 1 files changed, 10 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- 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 <ctype.h>
+#include <errno.h>
 #include <inttypes.h>
-
-#ifdef HAVE_AV_CONFIG_H
-/* only include the following when compiling package */
-#    include "config.h"
-
-#    include <stdlib.h>
-#    include <stdio.h>
-#    include <string.h>
-#    include <ctype.h>
-#    include <limits.h>
-#    include <errno.h>
-#    include <math.h>
-#endif /* HAVE_AV_CONFIG_H */
+#include <limits.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #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 */