From 162b4e41267d991038ff159a28a78388608a99ff Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Wed, 30 Jan 2013 17:50:49 +0100 Subject: [PATCH] re PR other/54620 (sha1.c has incorrect math if sizeof(size_t) is 8) PR other/54620 PR target/39064 * md5.h (md5_uintptr, md5_uint32): Define as uintptr_t/uint32_t if stdint.h and sys/types.h headers are present. * sha1.h (sha1_uintptr, sha1_uint32): Likewise. From-SVN: r195579 --- include/ChangeLog | 8 ++++++++ include/md5.h | 5 +++++ include/sha1.h | 5 +++++ 3 files changed, 18 insertions(+) diff --git a/include/ChangeLog b/include/ChangeLog index f3acbfc2124..e57a42aed3b 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,11 @@ +2013-01-30 Kai Tietz + + PR other/54620 + PR target/39064 + * md5.h (md5_uintptr, md5_uint32): Define as uintptr_t/uint32_t if + stdint.h and sys/types.h headers are present. + * sha1.h (sha1_uintptr, sha1_uint32): Likewise. + 2012-12-18 Aldy Hernandez PR other/54324 diff --git a/include/md5.h b/include/md5.h index b3ff4e14538..6da2fefe161 100644 --- a/include/md5.h +++ b/include/md5.h @@ -40,6 +40,11 @@ # include typedef u_int32_t md5_uint32; typedef uintptr_t md5_uintptr; +#elif defined (HAVE_SYS_TYPES_H) && defined (HAVE_STDINT_H) +#include +#include +typedef uint32_t md5_uint32; +typedef uintptr_t md5_uintptr; #else # define INT_MAX_32_BITS 2147483647 diff --git a/include/sha1.h b/include/sha1.h index 5473f91f412..4da5c37f386 100644 --- a/include/sha1.h +++ b/include/sha1.h @@ -39,6 +39,11 @@ # include typedef u_int32_t sha1_uint32; typedef uintptr_t sha1_uintptr; +#elif defined (HAVE_SYS_TYPES_H) && defined (HAVE_STDINT_H) +#include +#include +typedef uint32_t sha1_uint32; +typedef uintptr_t sha1_uintptr; #else # define INT_MAX_32_BITS 2147483647