1 Prefer types in <inttypes.h> to our own, because it removes file content
2 conflicts between 32- and 64-bit architectures. RFEd as #2829.
4 --- cyrus-sasl-2.1.21/configure.in 2006-05-16 07:37:52.000000000 -0400
5 +++ cyrus-sasl-2.1.21/configure.in 2006-05-16 07:37:52.000000000 -0400
9 AC_CHECK_HEADERS(des.h dlfcn.h fcntl.h limits.h malloc.h paths.h strings.h sys/file.h sys/time.h syslog.h unistd.h inttypes.h sys/uio.h sys/param.h sysexits.h stdarg.h varargs.h)
10 +AC_CHECK_TYPES([long long, int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t, uint64_t],,,[
11 +#ifdef HAVE_INTTYPES_H
12 +#include <inttypes.h>
15 IPv6_CHECK_SS_FAMILY()
17 --- cyrus-sasl-2.1.21/include/makemd5.c 2003-02-13 14:55:52.000000000 -0500
18 +++ cyrus-sasl-2.1.21/include/makemd5.c 2006-05-16 07:45:08.000000000 -0400
24 +#include "../config.h"
32 +#ifdef HAVE_INTTYPES_H
33 +#include <inttypes.h>
41 try_signed(FILE *f, int len)
60 try_unsigned(FILE *f, int len)
74 BITSIZE(unsigned char);
75 BITSIZE(unsigned short);
76 BITSIZE(unsigned int);
78 "/* POINTER defines a generic pointer type */\n"
79 "typedef unsigned char *POINTER;\n"
81 +#ifdef HAVE_INTTYPES_H
82 + "/* We try to define integer types for our use */\n"
83 + "#include <inttypes.h>\n"
95 -#endif /* HAVE_INT8_T */
98 -#endif /* HAVE_INT16_T */
101 -#endif /* HAVE_INT32_T */
102 -#ifndef HAVE_INT64_T
104 -#endif /* HAVE_INT64_T */
106 -#ifndef HAVE_U_INT8_T
108 -#endif /* HAVE_INT8_T */
109 -#ifndef HAVE_U_INT16_T
110 try_unsigned (f, 16);
111 -#endif /* HAVE_U_INT16_T */
112 -#ifndef HAVE_U_INT32_T
113 try_unsigned (f, 32);
114 -#endif /* HAVE_U_INT32_T */
115 -#ifndef HAVE_U_INT64_T
116 try_unsigned (f, 64);
117 -#endif /* HAVE_U_INT64_T */