diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-02-05 10:20:17 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-02-05 10:20:17 +0000 |
| commit | 966a71d9f5ce6d70b2cb90a137f9ae9cc936ceac (patch) | |
| tree | 6e9573296550d259f594636263ba48331030ddc2 /include | |
| parent | 0d9d8091acb1893fa14499c7dc7352665e342ffb (diff) | |
| download | gcc-966a71d9f5ce6d70b2cb90a137f9ae9cc936ceac.tar.gz | |
2013-02-05 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 195751 using svnmerge.py
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@195753 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 8 | ||||
| -rw-r--r-- | include/md5.h | 5 | ||||
| -rw-r--r-- | include/sha1.h | 5 |
3 files changed, 18 insertions, 0 deletions
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 <ktietz@redhat.com> + + 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 <aldyh@redhat.com> 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 <sys/types.h> typedef u_int32_t md5_uint32; typedef uintptr_t md5_uintptr; +#elif defined (HAVE_SYS_TYPES_H) && defined (HAVE_STDINT_H) +#include <stdint.h> +#include <sys/types.h> +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 <sys/types.h> typedef u_int32_t sha1_uint32; typedef uintptr_t sha1_uintptr; +#elif defined (HAVE_SYS_TYPES_H) && defined (HAVE_STDINT_H) +#include <stdint.h> +#include <sys/types.h> +typedef uint32_t sha1_uint32; +typedef uintptr_t sha1_uintptr; #else # define INT_MAX_32_BITS 2147483647 |