summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Tokarev <mjt@tls.msk.ru>2018-05-15 12:10:33 +0100
committerDimitri John Ledkov <xnox@ubuntu.com>2018-05-15 12:10:33 +0100
commit00ed48d3f3174e74ba75cdb7956abc68f492b0f2 (patch)
tree8644c76bdf34f542566d4be48377e32f32a72e11
parent3e6ba10f8aa782e354742d7ac978dd9c5722f9cb (diff)
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
-rw-r--r--sha1.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/sha1.h b/sha1.h
index 999fc6a3..0f986585 100644
--- a/sha1.h
+++ b/sha1.h
@@ -22,7 +22,7 @@
#include <stdio.h>
-#if defined HAVE_LIMITS_H || _LIBC
+#if 1 /* defined HAVE_LIMITS_H || _LIBC */
# include <limits.h>
#endif
@@ -33,9 +33,9 @@
the resulting executable. Locally running cross-compiled executables
is usually not possible. */
-#ifdef _LIBC
-# include <sys/types.h>
-typedef u_int32_t sha1_uint32;
+#if 1 /* def _LIBC */
+# include <stdint.h>
+typedef uint32_t sha1_uint32;
typedef uintptr_t sha1_uintptr;
#else
# define INT_MAX_32_BITS 2147483647