From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Sat, 13 Jun 2020 03:28:58 +0000 (-0700)
Subject: Remove unnecessary adler32_neon.h.
X-Git-Tag: 1.9.9-b1~211
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3bf5edce4a145a58b597c56ea2640a5d4785680;p=thirdparty%2Fzlib-ng.git

Remove unnecessary adler32_neon.h.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4b056b03..809772299 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -669,7 +669,6 @@ if(WITH_OPTIM)
         list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/arm.h)
         list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/armfeature.c)
         if(WITH_NEON)
-            list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/adler32_neon.h)
             list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/adler32_neon.c ${ARCHDIR}/slide_neon.c)
             add_definitions(-DARM_NEON_ADLER32 -DARM_NEON_SLIDEHASH)
             add_intrinsics_option("${NEONFLAG}")
diff --git a/arch/arm/adler32_neon.c b/arch/arm/adler32_neon.c
index b0bcd6ca1..a6e87904f 100644
--- a/arch/arm/adler32_neon.c
+++ b/arch/arm/adler32_neon.c
@@ -4,13 +4,13 @@
  *
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
-#include "adler32_neon.h"
 #if defined(__ARM_NEON__) || defined(__ARM_NEON)
 #ifdef _M_ARM64
 #  include <arm64_neon.h>
 #else
 #  include <arm_neon.h>
 #endif
+#include "../../zutil.h"
 #include "../../adler32_p.h"
 
 static void NEON_accum32(uint32_t *s, const unsigned char *buf, size_t len) {
diff --git a/arch/arm/adler32_neon.h b/arch/arm/adler32_neon.h
deleted file mode 100644
index f13de9534..000000000
--- a/arch/arm/adler32_neon.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright (C) 1995-2011, 2016 Mark Adler
- * Copyright (C) 2017 ARM Holdings Inc.
- * Author: Adenilson Cavalcanti <adenilson.cavalcanti@arm.com>
- *
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-#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:
-// http://stackoverflow.com/questions/26410466/gcc-linaro-compiler-throws-error-unknown-type-name-size-t
-#include <stdint.h>
-#include <stddef.h>
-uint32_t adler32_neon(uint32_t adler, const unsigned char *buf, size_t len);
-#endif
-#endif