From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Mon, 24 Apr 2017 09:24:50 +0000 (+0200)
Subject: Merge branch 'hacknslash7' of github.com:Dead2/zlib-ng into hacknslash7
X-Git-Tag: 1.9.9-b1~660^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96780f4013eed0497b4ba9d6f98c6ddeacb04e43;p=thirdparty%2Fzlib-ng.git

Merge branch 'hacknslash7' of github.com:Dead2/zlib-ng into hacknslash7
---

96780f4013eed0497b4ba9d6f98c6ddeacb04e43
diff --cc Makefile.in
index 4f7100c33,f4d0c0704..8dd749ff1
--- a/Makefile.in
+++ b/Makefile.in
@@@ -325,11 -324,13 +325,13 @@@ inflate.o: $(SRCDIR)/zutil.h $(SRCDIR)/
  inftrees.o: $(SRCDIR)/zutil.h $(SRCDIR)/zlib.h zconf.h $(SRCDIR)/inftrees.h
  trees.o: $(SRCDIR)/deflate.h $(SRCDIR)/zutil.h $(SRCDIR)/zlib.h zconf.h $(SRCDIR)/trees.h
  zutil.o: $(SRCDIR)/zutil.h $(SRCDIR)/gzguts.h $(SRCDIR)/zlib.h zconf.h
+ arch/aarch64/adler32_neon.o: $(SRCDIR)/arch/aarch64/adler32_neon.h
  arch/aarch64/crc32_acle.o: zconf.h
 -arch/aarch64/fill_window_arm.o: $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/zutil.h $(SRCDIR)/zlib.h zconf.h
 +arch/aarch64/fill_window_arm.o: $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h $(SRCDIR)/zutil.h $(SRCDIR)/zlib.h zconf.h
  arch/aarch64/insert_string_acle.o: $(SRCDIR)/deflate.h $(SRCDIR)/zutil.h $(SRCDIR)/zlib.h zconf.h
+ arch/arm/adler32_neon.o: $(SRCDIR)/arch/arm/adler32_neon.h
  arch/arm/crc32_acle.o: zconf.h
 -arch/arm/fill_window_arm.o: $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/zutil.h $(SRCDIR)/zlib.h zconf.h
 +arch/arm/fill_window_arm.o: $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h $(SRCDIR)/zutil.h $(SRCDIR)/zlib.h zconf.h
  arch/arm/insert_string_acle.o: $(SRCDIR)/deflate.h $(SRCDIR)/zutil.h $(SRCDIR)/zlib.h zconf.h
  arch/x86/crc_folding.o: $(SRCDIR)/arch/x86/crc_folding.h $(SRCDIR)/deflate.h $(SRCDIR)/zutil.h $(SRCDIR)/zlib.h zconf.h
  arch/x86/crc_pclmulqdq.o: $(SRCDIR)/arch/x86/x86.h $(SRCDIR)/arch/x86/crc_folding.h $(SRCDIR)/deflate.h $(SRCDIR)/zutil.h $(SRCDIR)/zlib.h zconf.h
@@@ -352,11 -352,13 +354,13 @@@ inflate.lo: $(SRCDIR)/zutil.h $(SRCDIR)
  inftrees.lo: $(SRCDIR)/zutil.h $(SRCDIR)/zlib.h zconf.h $(SRCDIR)/inftrees.h
  trees.lo: $(SRCDIR)/deflate.h $(SRCDIR)/zutil.h $(SRCDIR)/zlib.h zconf.h $(SRCDIR)/trees.h
  zutil.lo: $(SRCDIR)/zutil.h $(SRCDIR)/gzguts.h $(SRCDIR)/zlib.h zconf.h
+ arch/aarch64/adler32_neon.lo: $(SRCDIR)/arch/aarch64/adler32_neon.h
  arch/aarch64/crc32_acle.lo: zconf.h
 -arch/aarch64/fill_window_arm.lo: $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/zutil.h $(SRCDIR)/zlib.h zconf.h
 +arch/aarch64/fill_window_arm.lo: $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h $(SRCDIR)/zutil.h $(SRCDIR)/zlib.h zconf.h
  arch/aarch64/insert_string_acle.lo: $(SRCDIR)/deflate.h $(SRCDIR)/zutil.h $(SRCDIR)/zlib.h zconf.h
+ arch/arm/adler32_neon.lo: $(SRCDIR)/arch/arm/adler32_neon.h
  arch/arm/crc32_acle.lo: zconf.h
 -arch/arm/fill_window_arm.lo: $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/zutil.h $(SRCDIR)/zlib.h zconf.h
 +arch/arm/fill_window_arm.lo: $(SRCDIR)/deflate.h $(SRCDIR)/deflate_p.h $(SRCDIR)/functable.h $(SRCDIR)/zutil.h $(SRCDIR)/zlib.h zconf.h
  arch/arm/insert_string_acle.lo: $(SRCDIR)/deflate.h $(SRCDIR)/zutil.h $(SRCDIR)/zlib.h zconf.h
  arch/x86/crc_folding.lo: $(SRCDIR)/arch/x86/crc_folding.h $(SRCDIR)/deflate.h $(SRCDIR)/zutil.h $(SRCDIR)/zlib.h zconf.h
  arch/x86/crc_pclmulqdq.lo: $(SRCDIR)/arch/x86/x86.h $(SRCDIR)/arch/x86/crc_folding.h $(SRCDIR)/deflate.h $(SRCDIR)/zutil.h $(SRCDIR)/zlib.h zconf.h
diff --cc arch/aarch64/adler32_neon.h
index 6dffdbcb3,2b91673e3..6e32c3b21
--- a/arch/aarch64/adler32_neon.h
+++ b/arch/aarch64/adler32_neon.h
@@@ -16,11 -16,12 +16,11 @@@
   *    misrepresented as being the original software.
   * 3. This notice may not be removed or altered from any source distribution.
   */
- #ifndef __NEON_ADLER32__
- #define __NEON_ADLER32__
+ #ifndef __ADLER32_NEON__
+ #define __ADLER32_NEON__
  
  #if (defined(__ARM_NEON__) || defined(__ARM_NEON))
 -// Depending on the compiler flavor, size_t may be defined in
 -// one or the other header. See:
 +// Depending on the compiler flavor, size_t may be defined in one or the other header. See:
  // http://stackoverflow.com/questions/26410466/gcc-linaro-compiler-throws-error-unknown-type-name-size-t
  #include <stdint.h>
  #include <stddef.h>
diff --cc arch/arm/adler32_neon.h
index 6dffdbcb3,2b91673e3..6e32c3b21
--- a/arch/arm/adler32_neon.h
+++ b/arch/arm/adler32_neon.h
@@@ -16,11 -16,12 +16,11 @@@
   *    misrepresented as being the original software.
   * 3. This notice may not be removed or altered from any source distribution.
   */
- #ifndef __NEON_ADLER32__
- #define __NEON_ADLER32__
+ #ifndef __ADLER32_NEON__
+ #define __ADLER32_NEON__
  
  #if (defined(__ARM_NEON__) || defined(__ARM_NEON))
 -// Depending on the compiler flavor, size_t may be defined in
 -// one or the other header. See:
 +// Depending on the compiler flavor, size_t may be defined in one or the other header. See:
  // http://stackoverflow.com/questions/26410466/gcc-linaro-compiler-throws-error-unknown-type-name-size-t
  #include <stdint.h>
  #include <stddef.h>