From 00ed48d3f3174e74ba75cdb7956abc68f492b0f2 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Tue, 15 May 2018 12:10:33 +0100 Subject: do not #include ansidecl.h from sha1.h, use system headers In 3.2.5 version of mdadm, new sha1 implementation has been included which tries to include ansidecl.h header which is internal to some other project. But this #include isn't really necessary, since this implementation does not actually use any defines from ansidecl.h. So just remove the #include, instead of adding a new external dependency. References: http://www.spinics.net/lists/raid/msg38859.html While at it, unconditionally include system headers like limits.h and stdint.h, since on a Linux system these headers are available, and these contains definitive information about real system types than any guesses. Gbp-Pq: Name sha1-includes.diff --- sha1.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sha1.h') diff --git a/sha1.h b/sha1.h index 999fc6a3..0f986585 100644 --- a/sha1.h +++ b/sha1.h @@ -22,7 +22,7 @@ #include -#if defined HAVE_LIMITS_H || _LIBC +#if 1 /* defined HAVE_LIMITS_H || _LIBC */ # include #endif @@ -33,9 +33,9 @@ the resulting executable. Locally running cross-compiled executables is usually not possible. */ -#ifdef _LIBC -# include -typedef u_int32_t sha1_uint32; +#if 1 /* def _LIBC */ +# include +typedef uint32_t sha1_uint32; typedef uintptr_t sha1_uintptr; #else # define INT_MAX_32_BITS 2147483647 -- cgit v1.2.3