From 8014f25f6db719fa62336f997963532a14c568f6 Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Sat, 21 Jan 2012 04:30:10 -0800 Subject: Major restructuring of the code. --- src/misc/zlib/adler32.c | 2 +- src/misc/zlib/crc32.c | 2 +- src/misc/zlib/deflate.c | 2 +- src/misc/zlib/gzclose.c | 2 +- src/misc/zlib/gzguts.h | 2 +- src/misc/zlib/gzlib.c | 2 +- src/misc/zlib/gzread.c | 2 +- src/misc/zlib/gzwrite.c | 2 +- src/misc/zlib/infback.c | 2 +- src/misc/zlib/inffast.c | 2 +- src/misc/zlib/inflate.c | 2 +- src/misc/zlib/inftrees.c | 2 +- src/misc/zlib/trees.c | 2 +- src/misc/zlib/uncompr.c | 2 +- src/misc/zlib/zlib.h | 5 ++++- src/misc/zlib/zutil.c | 2 +- 16 files changed, 19 insertions(+), 16 deletions(-) (limited to 'src/misc/zlib') diff --git a/src/misc/zlib/adler32.c b/src/misc/zlib/adler32.c index 7783d96c..10208ab4 100644 --- a/src/misc/zlib/adler32.c +++ b/src/misc/zlib/adler32.c @@ -8,7 +8,7 @@ #include #include #include -#include "abc_global.h" +#include "src/misc/util/abc_global.h" #include "zutil.h" diff --git a/src/misc/zlib/crc32.c b/src/misc/zlib/crc32.c index 749480ef..6c33b549 100644 --- a/src/misc/zlib/crc32.c +++ b/src/misc/zlib/crc32.c @@ -29,7 +29,7 @@ #include #include #include -#include "abc_global.h" +#include "src/misc/util/abc_global.h" #include "zutil.h" /* for STDC and FAR definitions */ diff --git a/src/misc/zlib/deflate.c b/src/misc/zlib/deflate.c index ceeeed06..e47050bd 100644 --- a/src/misc/zlib/deflate.c +++ b/src/misc/zlib/deflate.c @@ -52,7 +52,7 @@ #include #include #include -#include "abc_global.h" +#include "src/misc/util/abc_global.h" #include "deflate.h" diff --git a/src/misc/zlib/gzclose.c b/src/misc/zlib/gzclose.c index 07d6e0d9..6cd8dc3d 100644 --- a/src/misc/zlib/gzclose.c +++ b/src/misc/zlib/gzclose.c @@ -6,7 +6,7 @@ #include #include #include -#include "abc_global.h" +#include "src/misc/util/abc_global.h" #include "gzguts.h" diff --git a/src/misc/zlib/gzguts.h b/src/misc/zlib/gzguts.h index 7334b92e..f95db6c2 100644 --- a/src/misc/zlib/gzguts.h +++ b/src/misc/zlib/gzguts.h @@ -61,7 +61,7 @@ #endif #include -#include "abc_global.h" +#include "src/misc/util/abc_global.h" ABC_NAMESPACE_HEADER_START diff --git a/src/misc/zlib/gzlib.c b/src/misc/zlib/gzlib.c index 1d88baa4..4d6fdfd0 100644 --- a/src/misc/zlib/gzlib.c +++ b/src/misc/zlib/gzlib.c @@ -6,7 +6,7 @@ #include #include #include -#include "abc_global.h" +#include "src/misc/util/abc_global.h" #include "gzguts.h" diff --git a/src/misc/zlib/gzread.c b/src/misc/zlib/gzread.c index 7abe5d9c..6a4d13b6 100644 --- a/src/misc/zlib/gzread.c +++ b/src/misc/zlib/gzread.c @@ -6,7 +6,7 @@ #include #include #include -#include "abc_global.h" +#include "src/misc/util/abc_global.h" #include "gzguts.h" diff --git a/src/misc/zlib/gzwrite.c b/src/misc/zlib/gzwrite.c index bf96602c..f7482615 100644 --- a/src/misc/zlib/gzwrite.c +++ b/src/misc/zlib/gzwrite.c @@ -6,7 +6,7 @@ #include #include #include -#include "abc_global.h" +#include "src/misc/util/abc_global.h" #include "gzguts.h" diff --git a/src/misc/zlib/infback.c b/src/misc/zlib/infback.c index 882b2492..7163f99d 100644 --- a/src/misc/zlib/infback.c +++ b/src/misc/zlib/infback.c @@ -13,7 +13,7 @@ #include #include #include -#include "abc_global.h" +#include "src/misc/util/abc_global.h" #include "zutil.h" #include "inftrees.h" diff --git a/src/misc/zlib/inffast.c b/src/misc/zlib/inffast.c index 22bc98d1..fbdf94d0 100644 --- a/src/misc/zlib/inffast.c +++ b/src/misc/zlib/inffast.c @@ -6,7 +6,7 @@ #include #include #include -#include "abc_global.h" +#include "src/misc/util/abc_global.h" #include "zutil.h" #include "inftrees.h" diff --git a/src/misc/zlib/inflate.c b/src/misc/zlib/inflate.c index c68c13f5..04feb237 100644 --- a/src/misc/zlib/inflate.c +++ b/src/misc/zlib/inflate.c @@ -83,7 +83,7 @@ #include #include #include -#include "abc_global.h" +#include "src/misc/util/abc_global.h" #include "zutil.h" #include "inftrees.h" diff --git a/src/misc/zlib/inftrees.c b/src/misc/zlib/inftrees.c index ad631f85..a73e58a8 100644 --- a/src/misc/zlib/inftrees.c +++ b/src/misc/zlib/inftrees.c @@ -6,7 +6,7 @@ #include #include #include -#include "abc_global.h" +#include "src/misc/util/abc_global.h" #include "zutil.h" #include "inftrees.h" diff --git a/src/misc/zlib/trees.c b/src/misc/zlib/trees.c index e107ba04..a7365594 100644 --- a/src/misc/zlib/trees.c +++ b/src/misc/zlib/trees.c @@ -37,7 +37,7 @@ #include #include #include -#include "abc_global.h" +#include "src/misc/util/abc_global.h" #include "deflate.h" diff --git a/src/misc/zlib/uncompr.c b/src/misc/zlib/uncompr.c index e195ec3e..cf021273 100644 --- a/src/misc/zlib/uncompr.c +++ b/src/misc/zlib/uncompr.c @@ -8,7 +8,7 @@ #include #include #include -#include "abc_global.h" +#include "src/misc/util/abc_global.h" #define ZLIB_INTERNAL #include "zlib.h" diff --git a/src/misc/zlib/zlib.h b/src/misc/zlib/zlib.h index 58ff1d15..94825b55 100644 --- a/src/misc/zlib/zlib.h +++ b/src/misc/zlib/zlib.h @@ -32,7 +32,10 @@ #define ZLIB_H #include -#include "abc_global.h" +#include +#include + +#include "src/misc/util/abc_global.h" #include "zconf.h" diff --git a/src/misc/zlib/zutil.c b/src/misc/zlib/zutil.c index 17a906d8..b74b21ea 100644 --- a/src/misc/zlib/zutil.c +++ b/src/misc/zlib/zutil.c @@ -8,7 +8,7 @@ #include #include #include -#include "abc_global.h" +#include "src/misc/util/abc_global.h" #include "zutil.h" -- cgit v1.2.3