diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2004-08-07 00:09:38 +0000 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2004-08-07 00:09:38 +0000 |
commit | a62be9f4039b4499cfbb76e394cad2259d03fa84 (patch) | |
tree | 5f444ac72b8b2418f2530af42b6c2fee823d18db /lib/md5.h | |
parent | 4d52451995952d65b6772a7849e88866b3542157 (diff) | |
download | gnulib-a62be9f4039b4499cfbb76e394cad2259d03fa84.tar.gz |
Merge from coreutils.
Diffstat (limited to 'lib/md5.h')
-rw-r--r-- | lib/md5.h | 43 |
1 files changed, 10 insertions, 33 deletions
@@ -1,6 +1,9 @@ /* md5.h - Declaration of functions and data types used for MD5 sum computing library functions. - Copyright (C) 1995, 1996, 1999, 2000, 2003 Free Software Foundation, Inc. + + Copyright (C) 1995, 1996, 1999, 2000, 2003, 2004 Free Software + Foundation, Inc. + NOTE: The canonical source of this file is maintained with the GNU C Library. Bugs can be reported to bug-glibc@prep.ai.mit.edu. @@ -22,42 +25,16 @@ #define _MD5_H 1 #include <stdio.h> -#include <limits.h> -/* The following contortions are an attempt to use the C preprocessor - to determine an unsigned integral type that is 32 bits wide. An - alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but - doing that would require that the configure script compile and *run* - the resulting executable. Locally running cross-compiled executables - is usually not possible. */ - -#ifdef _LIBC +#if HAVE_INTTYPES_H +# include <inttypes.h> +#endif +#if HAVE_STDINT_H || _LIBC # include <stdint.h> -typedef uint32_t md5_uint32; -typedef uintptr_t md5_uintptr; -#else -# define UINT_MAX_32_BITS 4294967295U - -# if UINT_MAX == UINT_MAX_32_BITS - typedef unsigned int md5_uint32; -# else -# if USHRT_MAX == UINT_MAX_32_BITS - typedef unsigned short md5_uint32; -# else -# if ULONG_MAX == UINT_MAX_32_BITS - typedef unsigned long md5_uint32; -# else - /* The following line is intended to evoke an error. - Using #error is not portable enough. */ - "Cannot determine unsigned 32-bit data type." -# endif -# endif -# endif -/* We have to make a guess about the integer type equivalent in size - to pointers which should always be correct. */ -typedef unsigned long int md5_uintptr; #endif +typedef uint32_t md5_uint32; + /* Structure to save state of computation between the single steps. */ struct md5_ctx { |