projects
/
external
/
binutils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for new load commands added by Apple to the MACH-O file format.
[external/binutils.git]
/
include
/
md5.h
diff --git
a/include/md5.h
b/include/md5.h
index
655933f
..
80bf1ed
100644
(file)
--- a/
include/md5.h
+++ b/
include/md5.h
@@
-1,6
+1,6
@@
/* md5.h - Declaration of functions and data types used for MD5 sum
computing library functions.
/* md5.h - Declaration of functions and data types used for MD5 sum
computing library functions.
- Copyright
1995, 1996, 2000
Free Software Foundation, Inc.
+ Copyright
(C) 1995-2018
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.
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.
@@
-27,6
+27,8
@@
# include <limits.h>
#endif
# include <limits.h>
#endif
+#include "ansidecl.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
/* 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
@@
-37,6
+39,12
@@
#ifdef _LIBC
# include <sys/types.h>
typedef u_int32_t md5_uint32;
#ifdef _LIBC
# 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
#else
# define INT_MAX_32_BITS 2147483647
@@
-64,6
+72,13
@@
typedef u_int32_t md5_uint32;
# endif
# endif
# endif
# 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
+
+#ifdef __cplusplus
+extern "C" {
#endif
/* Structure to save state of computation between the single steps. */
#endif
/* Structure to save state of computation between the single steps. */
@@
-76,7
+91,7
@@
struct md5_ctx
md5_uint32 total[2];
md5_uint32 buflen;
md5_uint32 total[2];
md5_uint32 buflen;
- char buffer[128];
+ char buffer[128]
ATTRIBUTE_ALIGNED_ALIGNOF(md5_uint32)
;
};
/*
};
/*
@@
-132,4
+147,8
@@
extern int md5_stream (FILE *stream, void *resblock);
digest. */
extern void *md5_buffer (const char *buffer, size_t len, void *resblock);
digest. */
extern void *md5_buffer (const char *buffer, size_t len, void *resblock);
+#ifdef __cplusplus
+}
+#endif
+
#endif
#endif