|
 |
6611fc |
Prefer types in <inttypes.h> to our own, because it removes file content
|
|
|
6611fc |
conflicts between 32- and 64-bit architectures. RFEd as #2829.
|
|
|
6611fc |
|
|
|
6611fc |
--- cyrus-sasl-2.1.21/configure.in 2006-05-16 07:37:52.000000000 -0400
|
|
|
6611fc |
+++ cyrus-sasl-2.1.21/configure.in 2006-05-16 07:37:52.000000000 -0400
|
|
|
6611fc |
@@ -1083,6 +1083,10 @@
|
|
|
6611fc |
AC_HEADER_DIRENT
|
|
|
6611fc |
AC_HEADER_SYS_WAIT
|
|
|
6611fc |
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)
|
|
|
6611fc |
+AC_CHECK_TYPES([long long, int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t, uint64_t],,,[
|
|
|
6611fc |
+#ifdef HAVE_INTTYPES_H
|
|
|
6611fc |
+#include <inttypes.h>
|
|
|
6611fc |
+#endif])
|
|
|
6611fc |
|
|
|
6611fc |
IPv6_CHECK_SS_FAMILY()
|
|
|
6611fc |
IPv6_CHECK_SA_LEN()
|
|
|
6611fc |
diff -up cyrus-sasl-2.1.26/configure.sizes cyrus-sasl-2.1.26/configure
|
|
|
6611fc |
--- cyrus-sasl-2.1.26/configure.sizes 2013-11-13 16:40:44.492792539 +0100
|
|
|
6611fc |
+++ cyrus-sasl-2.1.26/configure 2013-11-13 16:40:47.489777836 +0100
|
|
|
6611fc |
@@ -18166,6 +18166,124 @@ fi
|
|
|
6611fc |
|
|
|
6611fc |
done
|
|
|
6611fc |
|
|
|
6611fc |
+ac_fn_c_check_type "$LINENO" "long long" "ac_cv_type_long_long" "
|
|
|
6611fc |
+#ifdef HAVE_INTTYPES_H
|
|
|
6611fc |
+#include <inttypes.h>
|
|
|
6611fc |
+#endif
|
|
|
6611fc |
+"
|
|
|
6611fc |
+if test "x$ac_cv_type_long_long" = xyes; then :
|
|
|
6611fc |
+
|
|
|
6611fc |
+cat >>confdefs.h <<_ACEOF
|
|
|
6611fc |
+#define HAVE_LONG_LONG 1
|
|
|
6611fc |
+_ACEOF
|
|
|
6611fc |
+
|
|
|
6611fc |
+
|
|
|
6611fc |
+fi
|
|
|
6611fc |
+ac_fn_c_check_type "$LINENO" "int8_t" "ac_cv_type_int8_t" "
|
|
|
6611fc |
+#ifdef HAVE_INTTYPES_H
|
|
|
6611fc |
+#include <inttypes.h>
|
|
|
6611fc |
+#endif
|
|
|
6611fc |
+"
|
|
|
6611fc |
+if test "x$ac_cv_type_int8_t" = xyes; then :
|
|
|
6611fc |
+
|
|
|
6611fc |
+cat >>confdefs.h <<_ACEOF
|
|
|
6611fc |
+#define HAVE_INT8_T 1
|
|
|
6611fc |
+_ACEOF
|
|
|
6611fc |
+
|
|
|
6611fc |
+
|
|
|
6611fc |
+fi
|
|
|
6611fc |
+ac_fn_c_check_type "$LINENO" "uint8_t" "ac_cv_type_uint8_t" "
|
|
|
6611fc |
+#ifdef HAVE_INTTYPES_H
|
|
|
6611fc |
+#include <inttypes.h>
|
|
|
6611fc |
+#endif
|
|
|
6611fc |
+"
|
|
|
6611fc |
+if test "x$ac_cv_type_uint8_t" = xyes; then :
|
|
|
6611fc |
+
|
|
|
6611fc |
+cat >>confdefs.h <<_ACEOF
|
|
|
6611fc |
+#define HAVE_UINT8_T 1
|
|
|
6611fc |
+_ACEOF
|
|
|
6611fc |
+
|
|
|
6611fc |
+
|
|
|
6611fc |
+fi
|
|
|
6611fc |
+ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" "
|
|
|
6611fc |
+#ifdef HAVE_INTTYPES_H
|
|
|
6611fc |
+#include <inttypes.h>
|
|
|
6611fc |
+#endif
|
|
|
6611fc |
+"
|
|
|
6611fc |
+if test "x$ac_cv_type_int16_t" = xyes; then :
|
|
|
6611fc |
+
|
|
|
6611fc |
+cat >>confdefs.h <<_ACEOF
|
|
|
6611fc |
+#define HAVE_INT16_T 1
|
|
|
6611fc |
+_ACEOF
|
|
|
6611fc |
+
|
|
|
6611fc |
+
|
|
|
6611fc |
+fi
|
|
|
6611fc |
+ac_fn_c_check_type "$LINENO" "uint16_t" "ac_cv_type_uint16_t" "
|
|
|
6611fc |
+#ifdef HAVE_INTTYPES_H
|
|
|
6611fc |
+#include <inttypes.h>
|
|
|
6611fc |
+#endif
|
|
|
6611fc |
+"
|
|
|
6611fc |
+if test "x$ac_cv_type_uint16_t" = xyes; then :
|
|
|
6611fc |
+
|
|
|
6611fc |
+cat >>confdefs.h <<_ACEOF
|
|
|
6611fc |
+#define HAVE_UINT16_T 1
|
|
|
6611fc |
+_ACEOF
|
|
|
6611fc |
+
|
|
|
6611fc |
+
|
|
|
6611fc |
+fi
|
|
|
6611fc |
+ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "
|
|
|
6611fc |
+#ifdef HAVE_INTTYPES_H
|
|
|
6611fc |
+#include <inttypes.h>
|
|
|
6611fc |
+#endif
|
|
|
6611fc |
+"
|
|
|
6611fc |
+if test "x$ac_cv_type_int32_t" = xyes; then :
|
|
|
6611fc |
+
|
|
|
6611fc |
+cat >>confdefs.h <<_ACEOF
|
|
|
6611fc |
+#define HAVE_INT32_T 1
|
|
|
6611fc |
+_ACEOF
|
|
|
6611fc |
+
|
|
|
6611fc |
+
|
|
|
6611fc |
+fi
|
|
|
6611fc |
+ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "
|
|
|
6611fc |
+#ifdef HAVE_INTTYPES_H
|
|
|
6611fc |
+#include <inttypes.h>
|
|
|
6611fc |
+#endif
|
|
|
6611fc |
+"
|
|
|
6611fc |
+if test "x$ac_cv_type_uint32_t" = xyes; then :
|
|
|
6611fc |
+
|
|
|
6611fc |
+cat >>confdefs.h <<_ACEOF
|
|
|
6611fc |
+#define HAVE_UINT32_T 1
|
|
|
6611fc |
+_ACEOF
|
|
|
6611fc |
+
|
|
|
6611fc |
+
|
|
|
6611fc |
+fi
|
|
|
6611fc |
+ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t" "
|
|
|
6611fc |
+#ifdef HAVE_INTTYPES_H
|
|
|
6611fc |
+#include <inttypes.h>
|
|
|
6611fc |
+#endif
|
|
|
6611fc |
+"
|
|
|
6611fc |
+if test "x$ac_cv_type_int64_t" = xyes; then :
|
|
|
6611fc |
+
|
|
|
6611fc |
+cat >>confdefs.h <<_ACEOF
|
|
|
6611fc |
+#define HAVE_INT64_T 1
|
|
|
6611fc |
+_ACEOF
|
|
|
6611fc |
+
|
|
|
6611fc |
+
|
|
|
6611fc |
+fi
|
|
|
6611fc |
+ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "
|
|
|
6611fc |
+#ifdef HAVE_INTTYPES_H
|
|
|
6611fc |
+#include <inttypes.h>
|
|
|
6611fc |
+#endif
|
|
|
6611fc |
+"
|
|
|
6611fc |
+if test "x$ac_cv_type_uint64_t" = xyes; then :
|
|
|
6611fc |
+
|
|
|
6611fc |
+cat >>confdefs.h <<_ACEOF
|
|
|
6611fc |
+#define HAVE_UINT64_T 1
|
|
|
6611fc |
+_ACEOF
|
|
|
6611fc |
+
|
|
|
6611fc |
+
|
|
|
6611fc |
+fi
|
|
|
6611fc |
+
|
|
|
6611fc |
|
|
|
6611fc |
|
|
|
6611fc |
{ $as_echo "$as_me:$LINENO: checking whether you have ss_family in struct sockaddr_storage" >&5
|
|
|
6611fc |
diff -up cyrus-sasl-2.1.26/include/makemd5.c.sizes cyrus-sasl-2.1.26/include/makemd5.c
|
|
|
6611fc |
--- cyrus-sasl-2.1.26/include/makemd5.c.sizes 2012-01-28 00:31:36.000000000 +0100
|
|
|
6611fc |
+++ cyrus-sasl-2.1.26/include/makemd5.c 2013-11-13 16:22:24.195981512 +0100
|
|
|
6611fc |
@@ -82,12 +82,19 @@
|
|
|
6611fc |
*/
|
|
|
6611fc |
|
|
|
6611fc |
|
|
|
6611fc |
+#ifdef HAVE_CONFIG_H
|
|
|
6611fc |
+#include "../config.h"
|
|
|
6611fc |
+#endif
|
|
|
6611fc |
|
|
|
6611fc |
#include <stdio.h>
|
|
|
6611fc |
#include <string.h>
|
|
|
6611fc |
#include <stdlib.h>
|
|
|
6611fc |
#include <ctype.h>
|
|
|
6611fc |
|
|
|
6611fc |
+#ifdef HAVE_INTTYPES_H
|
|
|
6611fc |
+#include <inttypes.h>
|
|
|
6611fc |
+#endif
|
|
|
6611fc |
+
|
|
|
6611fc |
|
|
|
6611fc |
static void
|
|
|
6611fc |
my_strupr(char *s)
|
|
|
6611fc |
@@ -122,6 +129,18 @@
|
|
|
6611fc |
static void
|
|
|
6611fc |
try_signed(FILE *f, int len)
|
|
|
6611fc |
{
|
|
|
6611fc |
+#ifdef HAVE_INT8_T
|
|
|
6611fc |
+ BITSIZE(int8_t);
|
|
|
6611fc |
+#endif
|
|
|
6611fc |
+#ifdef HAVE_INT16_T
|
|
|
6611fc |
+ BITSIZE(int16_t);
|
|
|
6611fc |
+#endif
|
|
|
6611fc |
+#ifdef HAVE_INT32_T
|
|
|
6611fc |
+ BITSIZE(int32_t);
|
|
|
6611fc |
+#endif
|
|
|
6611fc |
+#ifdef HAVE_INT64_T
|
|
|
6611fc |
+ BITSIZE(int64_t);
|
|
|
6611fc |
+#endif
|
|
|
6611fc |
BITSIZE(signed char);
|
|
|
6611fc |
BITSIZE(short);
|
|
|
6611fc |
BITSIZE(int);
|
|
|
6611fc |
@@ -135,6 +154,18 @@
|
|
|
6611fc |
static void
|
|
|
6611fc |
try_unsigned(FILE *f, int len)
|
|
|
6611fc |
{
|
|
|
6611fc |
+#ifdef HAVE_UINT8_T
|
|
|
6611fc |
+ BITSIZE(uint8_t);
|
|
|
6611fc |
+#endif
|
|
|
6611fc |
+#ifdef HAVE_UINT16_T
|
|
|
6611fc |
+ BITSIZE(uint16_t);
|
|
|
6611fc |
+#endif
|
|
|
6611fc |
+#ifdef HAVE_UINT32_T
|
|
|
6611fc |
+ BITSIZE(uint32_t);
|
|
|
6611fc |
+#endif
|
|
|
6611fc |
+#ifdef HAVE_UINT64_T
|
|
|
6611fc |
+ BITSIZE(uint64_t);
|
|
|
6611fc |
+#endif
|
|
|
6611fc |
BITSIZE(unsigned char);
|
|
|
6611fc |
BITSIZE(unsigned short);
|
|
|
6611fc |
BITSIZE(unsigned int);
|
|
|
6611fc |
@@ -165,6 +196,11 @@
|
|
|
6611fc |
"/* POINTER defines a generic pointer type */\n"
|
|
|
6611fc |
"typedef unsigned char *POINTER;\n"
|
|
|
6611fc |
"\n"
|
|
|
6611fc |
+#ifdef HAVE_INTTYPES_H
|
|
|
6611fc |
+ "/* We try to define integer types for our use */\n"
|
|
|
6611fc |
+ "#include <inttypes.h>\n"
|
|
|
6611fc |
+ "\n"
|
|
|
6611fc |
+#endif
|
|
|
6611fc |
);
|
|
|
6611fc |
return 1;
|
|
|
6611fc |
}
|
|
|
6611fc |
@@ -212,31 +248,15 @@
|
|
|
6611fc |
|
|
|
6611fc |
print_pre(f);
|
|
|
6611fc |
|
|
|
6611fc |
-#ifndef HAVE_INT8_T
|
|
|
6611fc |
try_signed (f, 8);
|
|
|
6611fc |
-#endif /* HAVE_INT8_T */
|
|
|
6611fc |
-#ifndef HAVE_INT16_T
|
|
|
6611fc |
try_signed (f, 16);
|
|
|
6611fc |
-#endif /* HAVE_INT16_T */
|
|
|
6611fc |
-#ifndef HAVE_INT32_T
|
|
|
6611fc |
try_signed (f, 32);
|
|
|
6611fc |
-#endif /* HAVE_INT32_T */
|
|
|
6611fc |
-#ifndef HAVE_INT64_T
|
|
|
6611fc |
try_signed (f, 64);
|
|
|
6611fc |
-#endif /* HAVE_INT64_T */
|
|
|
6611fc |
|
|
|
6611fc |
-#ifndef HAVE_U_INT8_T
|
|
|
6611fc |
try_unsigned (f, 8);
|
|
|
6611fc |
-#endif /* HAVE_INT8_T */
|
|
|
6611fc |
-#ifndef HAVE_U_INT16_T
|
|
|
6611fc |
try_unsigned (f, 16);
|
|
|
6611fc |
-#endif /* HAVE_U_INT16_T */
|
|
|
6611fc |
-#ifndef HAVE_U_INT32_T
|
|
|
6611fc |
try_unsigned (f, 32);
|
|
|
6611fc |
-#endif /* HAVE_U_INT32_T */
|
|
|
6611fc |
-#ifndef HAVE_U_INT64_T
|
|
|
6611fc |
try_unsigned (f, 64);
|
|
|
6611fc |
-#endif /* HAVE_U_INT64_T */
|
|
|
6611fc |
|
|
|
6611fc |
print_post(f);
|
|
|
6611fc |
|