Ticket #41280: tiff-datatypes-configure.ac.diff

configure.ac

@@ -215 +215 @@
 AC_CHECK_SIZEOF(unsigned char *)
 
 AC_MSG_CHECKING(for signed 8-bit type)
-INT8_T='signed char'
+INT8_T='int8_t'
 AC_MSG_RESULT($INT8_T)
 AC_DEFINE_UNQUOTED(TIFF_INT8_T,$INT8_T,[Signed 8-bit type])
 
 AC_MSG_CHECKING(for unsigned 8-bit type)
-UINT8_T='unsigned char'
+UINT8_T='uint8_t'
 AC_MSG_RESULT($UINT8_T)
 AC_DEFINE_UNQUOTED(TIFF_UINT8_T,$UINT8_T,[Unsigned 8-bit type])
 
 AC_MSG_CHECKING(for signed 16-bit type)
-INT16_T='signed short'
+INT16_T='int16_t'
 AC_MSG_RESULT($INT16_T)
 AC_DEFINE_UNQUOTED(TIFF_INT16_T,$INT16_T,[Signed 16-bit type])
 
 
 AC_MSG_CHECKING(for unsigned 16-bit type)
-UINT16_T='unsigned short'
+UINT16_T='uint16_t'
 AC_MSG_RESULT($UINT16_T)
 AC_DEFINE_UNQUOTED(TIFF_UINT16_T,$UINT16_T,[Unsigned 16-bit type])
 
 AC_MSG_CHECKING(for signed 32-bit type)
-INT32_T='none'
-INT32_FORMAT='none'
-if test $ac_cv_sizeof_signed_int -eq 4
-then
-  INT32_T='signed int'
-  INT32_FORMAT='"%d"'
-elif test $ac_cv_sizeof_signed_long -eq 4
-then
-  INT32_T='signed long'
-  INT32_FORMAT='"%ld"'
-fi
+INT32_T='int32_t'
 AC_MSG_RESULT($INT32_T)
 AC_DEFINE_UNQUOTED(TIFF_INT32_T,$INT32_T,[Signed 32-bit type])
-AC_DEFINE_UNQUOTED(TIFF_INT32_FORMAT,$INT32_FORMAT,[Signed 32-bit type formatter])
 
 AC_MSG_CHECKING(for unsigned 32-bit type)
-UINT32_T='none'
-UINT32_FORMAT='none'
-if test $ac_cv_sizeof_unsigned_int -eq 4
-then
-  UINT32_T='unsigned int'
-  UINT32_FORMAT='"%u"'
-elif test $ac_cv_sizeof_unsigned_long -eq 4
-then
-  UINT32_T='unsigned long'
-  UINT32_FORMAT='"%lu"'
-fi
+UINT32_T='uint32_t'
 AC_MSG_RESULT($UINT32_T)
 AC_DEFINE_UNQUOTED(TIFF_UINT32_T,$UINT32_T,[Unsigned 32-bit type])
-AC_DEFINE_UNQUOTED(TIFF_UINT32_FORMAT,$UINT32_FORMAT,[Unsigned 32-bit type formatter])
 
 AC_MSG_CHECKING(for signed 64-bit type)
-INT64_T='none'
-INT64_FORMAT='none'
-if test $ac_cv_sizeof_signed_long -eq 8
-then
-  INT64_T='signed long'
-  INT64_FORMAT='"%ld"'
-elif test $ac_cv_sizeof_signed_long_long -eq 8
-then
-  INT64_T='signed long long'
-  case "${host_os}" in
-    mingw32*)
-      # MinGW32 understands 'long long', but uses printf from WIN32 CRT
-      INT64_FORMAT='"%I64d"'
-      ;;
-    *)
-      INT64_FORMAT='"%lld"'
-      ;;
-  esac
-fi
-
-
+INT64_T='int64_t'
 AC_MSG_RESULT($INT64_T)
 AC_DEFINE_UNQUOTED(TIFF_INT64_T,$INT64_T,[Signed 64-bit type])
-AC_DEFINE_UNQUOTED(TIFF_INT64_FORMAT,$INT64_FORMAT,[Signed 64-bit type formatter])
 
 AC_MSG_CHECKING(for unsigned 64-bit type)
-UINT64_T='none'
-UINT64_FORMAT='none'
-if test $ac_cv_sizeof_unsigned_long -eq 8
-then
-  UINT64_T='unsigned long'
-  UINT64_FORMAT='"%lu"'
-elif test $ac_cv_sizeof_unsigned_long_long -eq 8
-then
-  UINT64_T='unsigned long long'
-  case "${host_os}" in
-    mingw32*)
-      # MinGW32 understands 'unsigned long long', but uses printf from WIN32 CRT
-      UINT64_FORMAT='"%I64u"'
-      ;;
-    *)
-      UINT64_FORMAT='"%llu"'
-      ;;
-  esac
-fi
+UINT64_T='uint64_t'
 AC_MSG_RESULT($UINT64_T)
 AC_DEFINE_UNQUOTED(TIFF_UINT64_T,$UINT64_T,[Unsigned 64-bit type])
-AC_DEFINE_UNQUOTED(TIFF_UINT64_FORMAT,$UINT64_FORMAT,[Unsigned 64-bit type formatter])
 
 # Determine TIFF equivalent of ssize_t
 AC_MSG_CHECKING(for signed size type)

libtiff/tif_config.h.in

@@ -1 +1 @@
 /* libtiff/tif_config.h.in.  Generated from configure.ac by autoheader.  */
 
+#include <stdint.h>
+
 /* Define if building universal (internal helper macro) */
 #undef AC_APPLE_UNIVERSAL_BUILD
 

libtiff/tiffconf.h.in

@@ -7 +7 @@
 #ifndef _TIFFCONF_
 #define _TIFFCONF_
 
+#include <stdint.h>
+
 /* Signed 16-bit type */
 #undef TIFF_INT16_T