sbonazzo / rpms / cyrus-sasl

Forked from rpms/cyrus-sasl 2 years ago
Clone

Blame SOURCES/cyrus-sasl-2.1.21-sizes.patch

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