Rename gzendian to zendian since it is included in more than just the gzip library...

diff --git a/crc32.c b/crc32.c
index 6c495a57ad58f5488e43ee9e033cfc0a083e19da..2263fc71247240229405b416a311aea6d896e86d 100644 (file)
--- a/crc32.c
+++ b/crc32.c
@@ -12,7 +12,7 @@
 /* @(#) $Id$ */
 
 # include "zbuild.h"
-# include "gzendian.h"
+# include "zendian.h"
 # include <inttypes.h>
 
 /*

diff --git a/deflate.h b/deflate.h
index 3310d5c582236cf67f06f52aa53834e67fb4a8cd..99a4f5ca14606353f98cb61aae7973d6cea7ae30 100644 (file)
--- a/deflate.h
+++ b/deflate.h
@@ -13,7 +13,7 @@
 /* @(#) $Id$ */
 
 #include "zutil.h"
-#include "gzendian.h"
+#include "zendian.h"
 
 /* define NO_GZIP when compiling if you want to disable gzip header and
    trailer creation by deflate().  NO_GZIP would be used to avoid linking in

diff --git a/functable.c b/functable.c
index 108509798f62d2eff5f055e4a6553856e93fdd97..37a099581bf98a2de1749356f945a714b310d141 100644 (file)
--- a/functable.c
+++ b/functable.c
@@ -4,12 +4,11 @@
  */
 
 #include "zbuild.h"
-#include "functable.h"
+#include "zendian.h"
 #include "deflate.h"
 #include "deflate_p.h"
 
-#include "gzendian.h"
-
+#include "functable.h"
 /* insert_string */
 #ifdef X86_SSE4_2_CRC_HASH
 extern Pos insert_string_sse(deflate_state *const s, const Pos str, unsigned int count);

diff --git a/memcopy.h b/memcopy.h
index 301aa5f732c321a2b199a7ffd576ad6b3d45c220..4e870a0a9af356ff80242ba3bc8dad761590d3a4 100644 (file)
--- a/memcopy.h
+++ b/memcopy.h
@@ -4,7 +4,7 @@
 #ifndef MEMCOPY_H_
  #define MEMCOPY_H_
 
- #include "gzendian.h"
+ #include "zendian.h"
 
 /* Load 64 bits from IN and place the bytes at offset BITS in the result. */
 static inline uint64_t load_64_bits(const unsigned char *in, unsigned bits) {

diff --git a/win32/Makefile.arm b/win32/Makefile.arm
index 0b3f94064cad9bdf857c3338014f78bdb9f8bd1e..7142bba921862e0afbb49157c8a07559ac3394cf 100644 (file)
--- a/win32/Makefile.arm
+++ b/win32/Makefile.arm
@@ -118,14 +118,14 @@ $(TOP)/zconf$(SUFFIX).h: zconf
 SRCDIR = $(TOP)
 # Keep the dependences in sync with top-level Makefile.in
 adler32.obj: $(SRCDIR)/adler32.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/functable.h $(SRCDIR)/adler32_p.h
-functable.obj: $(SRCDIR)/functable.c $(SRCDIR)/zbuild.h $(SRCDIR)/functable.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/gzendian.h $(SRCDIR)/arch/x86/x86.h
+functable.obj: $(SRCDIR)/functable.c $(SRCDIR)/zbuild.h $(SRCDIR)/functable.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/zendian.h $(SRCDIR)/arch/x86/x86.h
 gzclose.obj: $(SRCDIR)/gzclose.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h
 gzlib.obj: $(SRCDIR)/gzlib.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h
 gzread.obj: $(SRCDIR)/gzread.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h
 gzwrite.obj: $(SRCDIR)/gzwrite.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h
 compress.obj: $(SRCDIR)/compress.c $(SRCDIR)/zbuild.h $(SRCDIR)/zlib$(SUFFIX).h
 uncompr.obj: $(SRCDIR)/uncompr.c $(SRCDIR)/zbuild.h $(SRCDIR)/zlib$(SUFFIX).h
-crc32.obj: $(SRCDIR)/crc32.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzendian.h $(SRCDIR)/deflate.h $(SRCDIR)/functable.h $(SRCDIR)/crc32.h
+crc32.obj: $(SRCDIR)/crc32.c $(SRCDIR)/zbuild.h $(SRCDIR)/zendian.h $(SRCDIR)/deflate.h $(SRCDIR)/functable.h $(SRCDIR)/crc32.h
 deflate.obj: $(SRCDIR)/deflate.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
 deflate_fast.obj: $(SRCDIR)/deflate_fast.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/match_p.h $(SRCDIR)/functable.h
 deflate_medium.obj: $(SRCDIR)/deflate_medium.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/match_p.h $(SRCDIR)/functable.h

diff --git a/win32/Makefile.msc b/win32/Makefile.msc
index 9f4b884c3cffdc78a2d8d29255fe3eeea3371722..f5bccdd2add4b521722b96704703627789710468 100644 (file)
--- a/win32/Makefile.msc
+++ b/win32/Makefile.msc
@@ -109,14 +109,14 @@ $(TOP)/zconf$(SUFFIX).h: zconf
 SRCDIR = $(TOP)
 # Keep the dependences in sync with top-level Makefile.in
 adler32.obj: $(SRCDIR)/adler32.c $(SRCDIR)/zbuild.h $(SRCDIR)/zutil.h $(SRCDIR)/functable.h $(SRCDIR)/adler32_p.h
-functable.obj: $(SRCDIR)/functable.c $(SRCDIR)/zbuild.h $(SRCDIR)/functable.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/gzendian.h $(SRCDIR)/arch/x86/x86.h
+functable.obj: $(SRCDIR)/functable.c $(SRCDIR)/zbuild.h $(SRCDIR)/functable.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/zendian.h $(SRCDIR)/arch/x86/x86.h
 gzclose.obj: $(SRCDIR)/gzclose.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h
 gzlib.obj: $(SRCDIR)/gzlib.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h
 gzread.obj: $(SRCDIR)/gzread.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h
 gzwrite.obj: $(SRCDIR)/gzwrite.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzguts.h
 compress.obj: $(SRCDIR)/compress.c $(SRCDIR)/zbuild.h $(SRCDIR)/zlib$(SUFFIX).h
 uncompr.obj: $(SRCDIR)/uncompr.c $(SRCDIR)/zbuild.h $(SRCDIR)/zlib$(SUFFIX).h
-crc32.obj: $(SRCDIR)/crc32.c $(SRCDIR)/zbuild.h $(SRCDIR)/gzendian.h $(SRCDIR)/deflate.h $(SRCDIR)/functable.h $(SRCDIR)/crc32.h
+crc32.obj: $(SRCDIR)/crc32.c $(SRCDIR)/zbuild.h $(SRCDIR)/zendian.h $(SRCDIR)/deflate.h $(SRCDIR)/functable.h $(SRCDIR)/crc32.h
 deflate.obj: $(SRCDIR)/deflate.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h
 deflate_fast.obj: $(SRCDIR)/deflate_fast.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/match_p.h $(SRCDIR)/functable.h
 deflate_medium.obj: $(SRCDIR)/deflate_medium.c $(SRCDIR)/zbuild.h $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/match_p.h $(SRCDIR)/functable.h

diff --git a/gzendian.h b/zendian.h
similarity index 96%
rename from gzendian.h
rename to zendian.h
index 5ee4cd387360fb12e66933ea667694205a3df003..5087034014e435321bf4c15245dbca1a14688c65 100644 (file)
--- a/gzendian.h
+++ b/zendian.h
@@ -1,4 +1,4 @@
-/* gzendian.h -- define BYTE_ORDER for endian tests
+/* zendian.h -- define BYTE_ORDER for endian tests
  * For conditions of distribution and use, see copyright notice in zlib.h
  */