[packages/sane-backends] remove cups, format and missing-files patches
atler
atler at pld-linux.org
Thu Oct 7 17:11:57 CEST 2021
commit 85f489c50e85a6c3a9a9fc8ed4b244db228b0ea3
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Oct 7 17:09:16 2021 +0200
remove cups, format and missing-files patches
dropped from spec in 793d902 and ccc5dbf
sane-backends-cups.patch | 17 -
sane-backends-format.patch | 20 -
sane-backends-missing-files.patch | 1096 -------------------------------------
3 files changed, 1133 deletions(-)
---
diff --git a/sane-backends-cups.patch b/sane-backends-cups.patch
deleted file mode 100644
index 6f3538c..0000000
--- a/sane-backends-cups.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- sane-backends-1.0.23/configure.in.orig 2012-08-19 22:31:34.000000000 +0200
-+++ sane-backends-1.0.23/configure.in 2013-05-28 18:03:13.483572312 +0200
-@@ -331,12 +331,13 @@
- if test -e /usr/include/cups/cups.h ; then
- AC_DEFINE(HAVE_CUPS, 1, [Is /usr/include/cups/cups.h available?])
- with_cups="yes"
-- LIBS="-lcups $LIBS"
-+ CUPS_LIBS="-lcups"
- else
- $as_echo "cups.h not found, you may want to install a cups development package"
- $as_echo "in order to autodetect network scanners in kodakaio."
- with_cups="no"
- fi
-+AC_SUBST([CUPS_LIBS])
-
- dnl ***********
- dnl USB Support
diff --git a/sane-backends-format.patch b/sane-backends-format.patch
deleted file mode 100644
index 60b515d..0000000
--- a/sane-backends-format.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- sane-backends-1.0.23/frontend/scanimage.c~ 2011-11-21 21:17:48.000000000 +0100
-+++ sane-backends-1.0.23/frontend/scanimage.c 2013-05-27 22:02:29.600562624 +0200
-@@ -1893,7 +1893,7 @@
- printf (start, int_arg);
- break;
- case 0:
-- printf (start);
-+ printf ("%s", start);
- break;
- }
- *percent = cc;
-@@ -1907,7 +1907,7 @@
- }
- }
- if (*start)
-- printf (start);
-+ printf ("%s", start);
- }
- }
- if (i == 0 && ch != 'f')
diff --git a/sane-backends-missing-files.patch b/sane-backends-missing-files.patch
deleted file mode 100644
index 75548d8..0000000
--- a/sane-backends-missing-files.patch
+++ /dev/null
@@ -1,1096 +0,0 @@
-diff -Nur sane-backends-1.0.19/m4.ne/byteorder.m4 sane-backends-1.0.19/m4/byteorder.m4
---- sane-backends-1.0.19/m4.ne/byteorder.m4 1970-01-01 01:00:00.000000000 +0100
-+++ sane-backends-1.0.19/m4/byteorder.m4 2008-05-30 18:54:17.627166176 +0200
-@@ -0,0 +1,354 @@
-+dnl AC_NEED_BYTEORDER_H ( HEADER-TO-GENERATE )
-+dnl Copyright 2001-2002 by Dan Fandrich <dan at coneharvesters.com>
-+dnl This file may be copied and used freely without restrictions. No warranty
-+dnl is expressed or implied.
-+dnl
-+dnl Create a header file that guarantees that byte swapping macros of the
-+dnl ntohl variety as well as the extended types included in OpenBSD and
-+dnl NetBSD such as le32toh are defined. If possible, the standard ntohl
-+dnl are overloaded as they are optimized for the given platform, but when
-+dnl this is not possible (e.g. on a big-endian machine) they are defined
-+dnl in this file.
-+
-+dnl Look for a symbol in a header file
-+dnl AC_HAVE_SYMBOL ( IDENTIFIER, HEADER-FILE, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND )
-+AC_DEFUN([AC_HAVE_SYMBOL],
-+[
-+AC_MSG_CHECKING(for $1 in $2)
-+AC_EGREP_CPP([symbol is present|\<$1\>],[
-+#include <$2>
-+#ifdef $1
-+ symbol is present
-+#endif
-+ ],
-+[AC_MSG_RESULT(yes)
-+$3
-+],
-+[AC_MSG_RESULT(no)
-+$4
-+])])
-+
-+
-+dnl Create a header file that defines extended byte swapping macros
-+AC_DEFUN([AC_NEED_BYTEORDER_H],
-+[
-+changequote(, )dnl
-+ac_dir=`echo $1|sed 's%/[^/][^/]*$%%'`
-+changequote([, ])dnl
-+if test "$ac_dir" != "$1" && test "$ac_dir" != .; then
-+ # The file is in a subdirectory.
-+ test ! -d "$ac_dir" && mkdir "$ac_dir"
-+fi
-+
-+# We're only interested in the target CPU, but it's not always set
-+effective_target="$target"
-+if test "x$effective_target" = xNONE -o "x$effective_target" = x ; then
-+ effective_target="$host"
-+fi
-+AC_SUBST(effective_target)
-+
-+cat > "$1" << EOF
-+/* This file is generated automatically by configure */
-+/* It is valid only for the system type ${effective_target} */
-+
-+#ifndef __BYTEORDER_H
-+#define __BYTEORDER_H
-+
-+EOF
-+
-+dnl First, do an endian check
-+AC_C_BIGENDIAN
-+
-+dnl Look for NetBSD-style extended byte swapping macros
-+AC_HAVE_SYMBOL(le32toh,machine/endian.h,
-+ [HAVE_LE32TOH=1
-+ cat >> "$1" << EOF
-+/* extended byte swapping macros are already available */
-+#include <machine/endian.h>
-+
-+EOF],
-+
-+[
-+
-+dnl Look for standard byte swapping macros
-+AC_HAVE_SYMBOL(ntohl,arpa/inet.h,
-+ [cat >> "$1" << EOF
-+/* ntohl and relatives live here */
-+#include <arpa/inet.h>
-+
-+EOF],
-+
-+ [AC_HAVE_SYMBOL(ntohl,netinet/in.h,
-+ [cat >> "$1" << EOF
-+/* ntohl and relatives live here */
-+#include <netinet/in.h>
-+
-+EOF],true)])
-+])
-+
-+dnl Look for generic byte swapping macros
-+
-+dnl OpenBSD
-+AC_HAVE_SYMBOL(swap32,machine/endian.h,
-+ [cat >> "$1" << EOF
-+/* swap32 and swap16 are defined in machine/endian.h */
-+
-+EOF],
-+
-+ [
-+dnl Linux GLIBC
-+ AC_HAVE_SYMBOL(bswap_32,byteswap.h,
-+ [cat >> "$1" << EOF
-+/* Define generic byte swapping functions */
-+#include <byteswap.h>
-+#define swap16(x) bswap_16(x)
-+#define swap32(x) bswap_32(x)
-+#define swap64(x) bswap_64(x)
-+
-+EOF],
-+
-+ [
-+dnl NetBSD
-+ AC_HAVE_SYMBOL(bswap32,machine/endian.h,
-+ dnl We're already including machine/endian.h if this test succeeds
-+ [cat >> "$1" << EOF
-+/* Define generic byte swapping functions */
-+EOF
-+ if test "$HAVE_LE32TOH" != "1"; then
-+ echo '#include <machine/endian.h>'>> "$1"
-+ fi
-+cat >> "$1" << EOF
-+#define swap16(x) bswap16(x)
-+#define swap32(x) bswap32(x)
-+#define swap64(x) bswap64(x)
-+
-+EOF],
-+
-+ [
-+dnl FreeBSD
-+ AC_HAVE_SYMBOL(__byte_swap_long,sys/types.h,
-+ [cat >> "$1" << EOF
-+/* Define generic byte swapping functions */
-+#include <sys/types.h>
-+#define swap16(x) __byte_swap_word(x)
-+#define swap32(x) __byte_swap_long(x)
-+/* No optimized 64 bit byte swapping macro is available */
-+#define swap64(x) ((uint64_t)(((uint64_t)(x) << 56) & 0xff00000000000000ULL | \\
-+ ((uint64_t)(x) << 40) & 0x00ff000000000000ULL | \\
-+ ((uint64_t)(x) << 24) & 0x0000ff0000000000ULL | \\
-+ ((uint64_t)(x) << 8) & 0x000000ff00000000ULL | \\
-+ ((x) >> 8) & 0x00000000ff000000ULL | \\
-+ ((x) >> 24) & 0x0000000000ff0000ULL | \\
-+ ((x) >> 40) & 0x000000000000ff00ULL | \\
-+ ((x) >> 56) & 0x00000000000000ffULL))
-+
-+EOF],
-+
-+ [
-+dnl OS X
-+ AC_HAVE_SYMBOL(NXSwapLong,machine/byte_order.h,
-+ [cat >> "$1" << EOF
-+/* Define generic byte swapping functions */
-+#include <machine/byte_order.h>
-+#define swap16(x) NXSwapShort(x)
-+#define swap32(x) NXSwapLong(x)
-+#define swap64(x) NXSwapLongLong(x)
-+
-+EOF],
-+ [
-+ if test $ac_cv_c_bigendian = yes; then
-+ cat >> "$1" << EOF
-+/* No other byte swapping functions are available on this big-endian system */
-+#define swap16(x) ((uint16_t)(((x) << 8) | ((uint16_t)(x) >> 8)))
-+#define swap32(x) ((uint32_t)(((uint32_t)(x) << 24) & 0xff000000UL | \\
-+ ((uint32_t)(x) << 8) & 0x00ff0000UL | \\
-+ ((x) >> 8) & 0x0000ff00UL | \\
-+ ((x) >> 24) & 0x000000ffUL))
-+#define swap64(x) ((uint64_t)(((uint64_t)(x) << 56) & 0xff00000000000000ULL | \\
-+ ((uint64_t)(x) << 40) & 0x00ff000000000000ULL | \\
-+ ((uint64_t)(x) << 24) & 0x0000ff0000000000ULL | \\
-+ ((uint64_t)(x) << 8) & 0x000000ff00000000ULL | \\
-+ ((x) >> 8) & 0x00000000ff000000ULL | \\
-+ ((x) >> 24) & 0x0000000000ff0000ULL | \\
-+ ((x) >> 40) & 0x000000000000ff00ULL | \\
-+ ((x) >> 56) & 0x00000000000000ffULL))
-+
-+EOF
-+ else
-+ cat >> "$1" << EOF
-+/* Use these as generic byteswapping macros on this little endian system */
-+#define swap16(x) ntohs(x)
-+#define swap32(x) ntohl(x)
-+/* No optimized 64 bit byte swapping macro is available */
-+#define swap64(x) ((uint64_t)(((uint64_t)(x) << 56) & 0xff00000000000000ULL | \\
-+ ((uint64_t)(x) << 40) & 0x00ff000000000000ULL | \\
-+ ((uint64_t)(x) << 24) & 0x0000ff0000000000ULL | \\
-+ ((uint64_t)(x) << 8) & 0x000000ff00000000ULL | \\
-+ ((x) >> 8) & 0x00000000ff000000ULL | \\
-+ ((x) >> 24) & 0x0000000000ff0000ULL | \\
-+ ((x) >> 40) & 0x000000000000ff00ULL | \\
-+ ((x) >> 56) & 0x00000000000000ffULL))
-+
-+EOF
-+ fi
-+])
-+ ])
-+ ])
-+ ])
-+])
-+
-+
-+[
-+if test "$HAVE_LE32TOH" != "1"; then
-+ cat >> "$1" << EOF
-+/* The byte swapping macros have the form: */
-+/* EENN[a]toh or htoEENN[a] where EE is be (big endian) or */
-+/* le (little-endian), NN is 16 or 32 (number of bits) and a, */
-+/* if present, indicates that the endian side is a pointer to an */
-+/* array of uint8_t bytes instead of an integer of the specified length. */
-+/* h refers to the host's ordering method. */
-+
-+/* So, to convert a 32-bit integer stored in a buffer in little-endian */
-+/* format into a uint32_t usable on this machine, you could use: */
-+/* uint32_t value = le32atoh(&buf[3]); */
-+/* To put that value back into the buffer, you could use: */
-+/* htole32a(&buf[3], value); */
-+
-+/* Define aliases for the standard byte swapping macros */
-+/* Arguments to these macros must be properly aligned on natural word */
-+/* boundaries in order to work properly on all architectures */
-+#define htobe16(x) htons(x)
-+#define htobe32(x) htonl(x)
-+#define be16toh(x) ntohs(x)
-+#define be32toh(x) ntohl(x)
-+
-+#define HTOBE16(x) (x) = htobe16(x)
-+#define HTOBE32(x) (x) = htobe32(x)
-+#define BE32TOH(x) (x) = be32toh(x)
-+#define BE16TOH(x) (x) = be16toh(x)
-+
-+EOF
-+
-+ if test $ac_cv_c_bigendian = yes; then
-+ cat >> "$1" << EOF
-+/* Define our own extended byte swapping macros for big-endian machines */
-+#define htole16(x) swap16(x)
-+#define htole32(x) swap32(x)
-+#define le16toh(x) swap16(x)
-+#define le32toh(x) swap32(x)
-+
-+#define htobe64(x) (x)
-+#define be64toh(x) (x)
-+
-+#define HTOLE16(x) (x) = htole16(x)
-+#define HTOLE32(x) (x) = htole32(x)
-+#define LE16TOH(x) (x) = le16toh(x)
-+#define LE32TOH(x) (x) = le32toh(x)
-+
-+#define HTOBE64(x) (void) (x)
-+#define BE64TOH(x) (void) (x)
-+
-+EOF
-+ else
-+ cat >> "$1" << EOF
-+/* On little endian machines, these macros are null */
-+#define htole16(x) (x)
-+#define htole32(x) (x)
-+#define htole64(x) (x)
-+#define le16toh(x) (x)
-+#define le32toh(x) (x)
-+#define le64toh(x) (x)
-+
-+#define HTOLE16(x) (void) (x)
-+#define HTOLE32(x) (void) (x)
-+#define HTOLE64(x) (void) (x)
-+#define LE16TOH(x) (void) (x)
-+#define LE32TOH(x) (void) (x)
-+#define LE64TOH(x) (void) (x)
-+
-+/* These don't have standard aliases */
-+#define htobe64(x) swap64(x)
-+#define be64toh(x) swap64(x)
-+
-+#define HTOBE64(x) (x) = htobe64(x)
-+#define BE64TOH(x) (x) = be64toh(x)
-+
-+EOF
-+ fi
-+fi
-+
-+cat >> "$1" << EOF
-+/* Define the C99 standard length-specific integer types */
-+#include <_stdint.h>
-+
-+EOF
-+
-+case "${effective_target}" in
-+ i[3456]86-*)
-+ cat >> "$1" << EOF
-+/* Here are some macros to create integers from a byte array */
-+/* These are used to get and put integers from/into a uint8_t array */
-+/* with a specific endianness. This is the most portable way to generate */
-+/* and read messages to a network or serial device. Each member of a */
-+/* packet structure must be handled separately. */
-+
-+/* The i386 and compatibles can handle unaligned memory access, */
-+/* so use the optimized macros above to do this job */
-+#define be16atoh(x) be16toh(*(uint16_t*)(x))
-+#define be32atoh(x) be32toh(*(uint32_t*)(x))
-+#define be64atoh(x) be64toh(*(uint64_t*)(x))
-+#define le16atoh(x) le16toh(*(uint16_t*)(x))
-+#define le32atoh(x) le32toh(*(uint32_t*)(x))
-+#define le64atoh(x) le64toh(*(uint64_t*)(x))
-+
-+#define htobe16a(a,x) *(uint16_t*)(a) = htobe16(x)
-+#define htobe32a(a,x) *(uint32_t*)(a) = htobe32(x)
-+#define htobe64a(a,x) *(uint64_t*)(a) = htobe64(x)
-+#define htole16a(a,x) *(uint16_t*)(a) = htole16(x)
-+#define htole32a(a,x) *(uint32_t*)(a) = htole32(x)
-+#define htole64a(a,x) *(uint64_t*)(a) = htole64(x)
-+
-+EOF
-+ ;;
-+
-+ *)
-+ cat >> "$1" << EOF
-+/* Here are some macros to create integers from a byte array */
-+/* These are used to get and put integers from/into a uint8_t array */
-+/* with a specific endianness. This is the most portable way to generate */
-+/* and read messages to a network or serial device. Each member of a */
-+/* packet structure must be handled separately. */
-+
-+/* Non-optimized but portable macros */
-+#define be16atoh(x) ((uint16_t)(((x)[0]<<8)|(x)[1]))
-+#define be32atoh(x) ((uint32_t)(((x)[0]<<24)|((x)[1]<<16)|((x)[2]<<8)|(x)[3]))
-+#define be64atoh(x) ((uint64_t)(((x)[0]<<56)|((x)[1]<<48)|((x)[2]<<40)| \\
-+ ((x)[3]<<32)|((x)[4]<<24)|((x)[5]<<16)|((x)[6]<<8)|(x)[7]))
-+#define le16atoh(x) ((uint16_t)(((x)[1]<<8)|(x)[0]))
-+#define le32atoh(x) ((uint32_t)(((x)[3]<<24)|((x)[2]<<16)|((x)[1]<<8)|(x)[0]))
-+#define le64atoh(x) ((uint64_t)(((x)[7]<<56)|((x)[6]<<48)|((x)[5]<<40)| \\
-+ ((x)[4]<<32)|((x)[3]<<24)|((x)[2]<<16)|((x)[1]<<8)|(x)[0]))
-+
-+#define htobe16a(a,x) (a)[0]=(uint8_t)((x)>>8), (a)[1]=(uint8_t)(x)
-+#define htobe32a(a,x) (a)[0]=(uint8_t)((x)>>24), (a)[1]=(uint8_t)((x)>>16), \\
-+ (a)[2]=(uint8_t)((x)>>8), (a)[3]=(uint8_t)(x)
-+#define htobe64a(a,x) (a)[0]=(uint8_t)((x)>>56), (a)[1]=(uint8_t)((x)>>48), \\
-+ (a)[2]=(uint8_t)((x)>>40), (a)[3]=(uint8_t)((x)>>32), \\
-+ (a)[4]=(uint8_t)((x)>>24), (a)[5]=(uint8_t)((x)>>16), \\
-+ (a)[6]=(uint8_t)((x)>>8), (a)[7]=(uint8_t)(x)
-+#define htole16a(a,x) (a)[1]=(uint8_t)((x)>>8), (a)[0]=(uint8_t)(x)
-+#define htole32a(a,x) (a)[3]=(uint8_t)((x)>>24), (a)[2]=(uint8_t)((x)>>16), \\
-+ (a)[1]=(uint8_t)((x)>>8), (a)[0]=(uint8_t)(x)
-+#define htole64a(a,x) (a)[7]=(uint8_t)((x)>>56), (a)[6]=(uint8_t)((x)>>48), \\
-+ (a)[5]=(uint8_t)((x)>>40), (a)[4]=(uint8_t)((x)>>32), \\
-+ (a)[3]=(uint8_t)((x)>>24), (a)[2]=(uint8_t)((x)>>16), \\
-+ (a)[1]=(uint8_t)((x)>>8), (a)[0]=(uint8_t)(x)
-+
-+EOF
-+ ;;
-+esac
-+]
-+
-+cat >> "$1" << EOF
-+#endif /*__BYTEORDER_H*/
-+EOF])
-diff -Nur sane-backends-1.0.19/m4.ne/stdint.m4 sane-backends-1.0.19/m4/stdint.m4
---- sane-backends-1.0.19/m4.ne/stdint.m4 1970-01-01 01:00:00.000000000 +0100
-+++ sane-backends-1.0.19/m4/stdint.m4 2008-05-30 18:54:17.627166176 +0200
-@@ -0,0 +1,734 @@
-+dnl AC_NEED_STDINT_H ( HEADER-TO-GENERATE )
-+dnl Copyright 2001-2002 by Dan Fandrich <dan at coneharvesters.com>
-+dnl This file may be copied and used freely without restrictions. No warranty
-+dnl is expressed or implied.
-+dnl
-+dnl Look for a header file that defines size-specific integer types like the
-+dnl ones recommended to be in stdint.h in the C99 standard (e.g. uint32_t).
-+dnl This is a dumbed-down version of the macro of the same name in the file
-+dnl ac_need_stdint_h.m4 which is part of the ac-archive, available at
-+dnl <URL:http://ac-archive.sourceforge.net/> (also, another macro
-+dnl AC_CREATE_STDINT_H by the same author). This version is not as smart,
-+dnl but works on older autoconf versions and has a different license.
-+
-+dnl AX_CHECK_DEFINED_TYPE ( TYPE, FILE, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND )
-+dnl This is similar to _AC_CHECK_TYPE_NEW (a.k.a. new syntax version of
-+dnl AC_CHECK_TYPE) in autoconf 2.50 but works on older versions
-+AC_DEFUN([AX_CHECK_DEFINED_TYPE],
-+[AC_MSG_CHECKING([for $1 in $2])
-+AC_EGREP_CPP(changequote(<<,>>)dnl
-+<<(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]>>dnl
-+changequote([,]), [#include <$2>],
-+ac_cv_type_$1=yes, ac_cv_type_$1=no)dnl
-+AC_MSG_RESULT($ac_cv_type_$1)
-+if test $ac_cv_type_$1 = yes; then
-+ $3
-+else
-+ $4
-+fi
-+])
-+
-+dnl Look for a header file that defines size-specific integer types
-+AC_DEFUN([AX_NEED_STDINT_H],
-+[
-+changequote(, )dnl
-+ac_dir=`echo "$1"|sed 's%/[^/][^/]*$%%'`
-+changequote([, ])dnl
-+if test "$ac_dir" != "$1" && test "$ac_dir" != .; then
-+ # The file is in a subdirectory.
-+ test ! -d "$ac_dir" && mkdir "$ac_dir"
-+fi
-+
-+AX_CHECK_DEFINED_TYPE(uint8_t,
-+stdint.h,
-+[
-+cat > "$1" <<EOF
-+/* This file is generated automatically by configure */
-+#include <stdint.h>
-+EOF],
-+[AX_CHECK_DEFINED_TYPE(uint8_t,
-+inttypes.h,
-+[cat > "$1" <<EOF
-+/* This file is generated automatically by configure */
-+#include <inttypes.h>
-+EOF],
-+[AX_CHECK_DEFINED_TYPE(uint8_t,
-+sys/types.h,
-+[cat > "$1" <<EOF
-+/* This file is generated automatically by configure */
-+#include <sys/types.h>
-+EOF],
-+[AX_CHECK_DEFINED_TYPE(u_int8_t,
-+sys/types.h,
-+[cat > "$1" <<EOF
-+/* This file is generated automatically by configure */
-+#ifndef __STDINT_H
-+#define __STDINT_H
-+#include <sys/types.h>
-+typedef u_int8_t uint8_t;
-+typedef u_int16_t uint16_t;
-+typedef u_int32_t uint32_t;
-+EOF
-+
-+AX_CHECK_DEFINED_TYPE(u_int64_t,
-+sys/types.h,
-+[cat >> "$1" <<EOF
-+typedef u_int64_t uint64_t;
-+#endif /*!__STDINT_H*/
-+EOF],
-+[cat >> "$1" <<EOF
-+/* 64-bit types are not available on this system */
-+/* typedef u_int64_t uint64_t; */
-+#endif /*!__STDINT_H*/
-+EOF])
-+
-+],
-+[AC_MSG_WARN([I can't find size-specific integer definitions on this system])
-+if test -e "$1" ; then
-+ rm -f "$1"
-+fi
-+])])])])dnl
-+])
-+
-+AC_DEFUN([AX_CHECK_DATA_MODEL],[
-+ AC_CHECK_SIZEOF(char)
-+ AC_CHECK_SIZEOF(short)
-+ AC_CHECK_SIZEOF(int)
-+ AC_CHECK_SIZEOF(long)
-+ AC_CHECK_SIZEOF(void*)
-+ ac_cv_char_data_model=""
-+ ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_char"
-+ ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_short"
-+ ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_int"
-+ ac_cv_long_data_model=""
-+ ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_int"
-+ ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_long"
-+ ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_voidp"
-+ AC_MSG_CHECKING([data model])
-+ case "$ac_cv_char_data_model/$ac_cv_long_data_model" in
-+ 122/242) ac_cv_data_model="IP16" ; n="standard 16bit machine" ;;
-+ 122/244) ac_cv_data_model="LP32" ; n="standard 32bit machine" ;;
-+ 122/*) ac_cv_data_model="i16" ; n="unusual int16 model" ;;
-+ 124/444) ac_cv_data_model="ILP32" ; n="standard 32bit unixish" ;;
-+ 124/488) ac_cv_data_model="LP64" ; n="standard 64bit unixish" ;;
-+ 124/448) ac_cv_data_model="LLP64" ; n="unusual 64bit unixish" ;;
-+ 124/*) ac_cv_data_model="i32" ; n="unusual int32 model" ;;
-+ 128/888) ac_cv_data_model="ILP64" ; n="unusual 64bit numeric" ;;
-+ 128/*) ac_cv_data_model="i64" ; n="unusual int64 model" ;;
-+ 222/*2) ac_cv_data_model="DSP16" ; n="strict 16bit dsptype" ;;
-+ 333/*3) ac_cv_data_model="DSP24" ; n="strict 24bit dsptype" ;;
-+ 444/*4) ac_cv_data_model="DSP32" ; n="strict 32bit dsptype" ;;
-+ 666/*6) ac_cv_data_model="DSP48" ; n="strict 48bit dsptype" ;;
-+ 888/*8) ac_cv_data_model="DSP64" ; n="strict 64bit dsptype" ;;
-+ 222/*|333/*|444/*|666/*|888/*) :
-+ ac_cv_data_model="iDSP" ; n="unusual dsptype" ;;
-+ *) ac_cv_data_model="none" ; n="very unusual model" ;;
-+ esac
-+ AC_MSG_RESULT([$ac_cv_data_model ($ac_cv_long_data_model, $n)])
-+])
-+
-+dnl AX_CHECK_HEADER_STDINT_X([HEADERLIST][,ACTION-IF])
-+AC_DEFUN([AX_CHECK_HEADER_STDINT_X],[
-+AC_CACHE_CHECK([for stdint uintptr_t], [ac_cv_header_stdint_x],[
-+ ac_cv_header_stdint_x="" # the 1997 typedefs (inttypes.h)
-+ AC_MSG_RESULT([(..)])
-+ for i in m4_ifval([$1],[$1],[stdint.h inttypes.h sys/inttypes.h]) ; do
-+ unset ac_cv_type_uintptr_t
-+ unset ac_cv_type_uint64_t
-+ AC_CHECK_TYPE(uintptr_t,[ac_cv_header_stdint_x=$i],continue,[#include <$i>])
-+ AC_CHECK_TYPE(uint64_t,[and64="/uint64_t"],[and64=""],[#include<$i>])
-+ m4_ifvaln([$1],[$1]) break
-+ done
-+ AC_MSG_CHECKING([for stdint uintptr_t])
-+ ])
-+])
-+
-+AC_DEFUN([AX_CHECK_HEADER_STDINT_O],[
-+AC_CACHE_CHECK([for stdint uint32_t], [ac_cv_header_stdint_o],[
-+ ac_cv_header_stdint_o="" # the 1995 typedefs (sys/inttypes.h)
-+ AC_MSG_RESULT([(..)])
-+ for i in m4_ifval([$1],[$1],[inttypes.h sys/inttypes.h stdint.h]) ; do
-+ unset ac_cv_type_uint32_t
-+ unset ac_cv_type_uint64_t
-+ AC_CHECK_TYPE(uint32_t,[ac_cv_header_stdint_o=$i],continue,[#include <$i>])
-+ AC_CHECK_TYPE(uint64_t,[and64="/uint64_t"],[and64=""],[#include<$i>])
-+ m4_ifvaln([$1],[$1]) break
-+ break;
-+ done
-+ AC_MSG_CHECKING([for stdint uint32_t])
-+ ])
-+])
-+
-+AC_DEFUN([AX_CHECK_HEADER_STDINT_U],[
-+AC_CACHE_CHECK([for stdint u_int32_t], [ac_cv_header_stdint_u],[
-+ ac_cv_header_stdint_u="" # the BSD typedefs (sys/types.h)
-+ AC_MSG_RESULT([(..)])
-+ for i in m4_ifval([$1],[$1],[sys/types.h inttypes.h sys/inttypes.h]) ; do
-+ unset ac_cv_type_u_int32_t
-+ unset ac_cv_type_u_int64_t
-+ AC_CHECK_TYPE(u_int32_t,[ac_cv_header_stdint_u=$i],continue,[#include <$i>])
-+ AC_CHECK_TYPE(u_int64_t,[and64="/u_int64_t"],[and64=""],[#include<$i>])
-+ m4_ifvaln([$1],[$1]) break
-+ break;
-+ done
-+ AC_MSG_CHECKING([for stdint u_int32_t])
-+ ])
-+])
-+
-+AC_DEFUN([AX_CREATE_STDINT_H],
-+[# ------ AX CREATE STDINT H -------------------------------------
-+AC_MSG_CHECKING([for stdint types])
-+ac_stdint_h=`echo ifelse($1, , _stdint.h, $1)`
-+# try to shortcircuit - if the default include path of the compiler
-+# can find a "stdint.h" header then we assume that all compilers can.
-+AC_CACHE_VAL([ac_cv_header_stdint_t],[
-+old_CXXFLAGS="$CXXFLAGS" ; CXXFLAGS=""
-+old_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS=""
-+old_CFLAGS="$CFLAGS" ; CFLAGS=""
-+AC_TRY_COMPILE([#include <stdint.h>],[int_least32_t v = 0;],
-+[ac_cv_stdint_result="(assuming C99 compatible system)"
-+ ac_cv_header_stdint_t="stdint.h"; ],
-+[ac_cv_header_stdint_t=""])
-+CXXFLAGS="$old_CXXFLAGS"
-+CPPFLAGS="$old_CPPFLAGS"
-+CFLAGS="$old_CFLAGS" ])
-+
-+v="... $ac_cv_header_stdint_h"
-+if test "$ac_stdint_h" = "stdint.h" ; then
-+ AC_MSG_RESULT([(are you sure you want them in ./stdint.h?)])
-+elif test "$ac_stdint_h" = "inttypes.h" ; then
-+ AC_MSG_RESULT([(are you sure you want them in ./inttypes.h?)])
-+elif test "_$ac_cv_header_stdint_t" = "_" ; then
-+ AC_MSG_RESULT([(putting them into $ac_stdint_h)$v])
-+else
-+ ac_cv_header_stdint="$ac_cv_header_stdint_t"
-+ AC_MSG_RESULT([$ac_cv_header_stdint (shortcircuit)])
-+fi
-+
-+if test "_$ac_cv_header_stdint_t" = "_" ; then # can not shortcircuit..
-+
-+dnl .....intro message done, now do a few system checks.....
-+dnl btw, all old CHECK_TYPE macros do automatically "DEFINE" a type,
-+dnl therefore we use the autoconf implementation detail CHECK_TYPE_NEW
-+dnl instead that is triggered with 3 or more arguments (see types.m4)
-+
-+inttype_headers=`echo $2 | sed -e 's/,/ /g'`
-+
-+ac_cv_stdint_result="(no helpful system typedefs seen)"
-+AX_CHECK_HEADER_STDINT_X(dnl
-+ stdint.h inttypes.h sys/inttypes.h $inttype_headers,
-+ ac_cv_stdint_result="(seen uintptr_t$and64 in $i)")
-+
-+if test "_$ac_cv_header_stdint_x" = "_" ; then
-+AX_CHECK_HEADER_STDINT_O(dnl,
-+ inttypes.h sys/inttypes.h stdint.h $inttype_headers,
-+ ac_cv_stdint_result="(seen uint32_t$and64 in $i)")
-+fi
-+
-+if test "_$ac_cv_header_stdint_x" = "_" ; then
-+if test "_$ac_cv_header_stdint_o" = "_" ; then
-+AX_CHECK_HEADER_STDINT_U(dnl,
-+ sys/types.h inttypes.h sys/inttypes.h $inttype_headers,
-+ ac_cv_stdint_result="(seen u_int32_t$and64 in $i)")
-+fi fi
-+
-+dnl if there was no good C99 header file, do some typedef checks...
-+if test "_$ac_cv_header_stdint_x" = "_" ; then
-+ AC_MSG_CHECKING([for stdint datatype model])
-+ AC_MSG_RESULT([(..)])
-+ AX_CHECK_DATA_MODEL
-+fi
-+
-+if test "_$ac_cv_header_stdint_x" != "_" ; then
-+ ac_cv_header_stdint="$ac_cv_header_stdint_x"
-+elif test "_$ac_cv_header_stdint_o" != "_" ; then
-+ ac_cv_header_stdint="$ac_cv_header_stdint_o"
-+elif test "_$ac_cv_header_stdint_u" != "_" ; then
-+ ac_cv_header_stdint="$ac_cv_header_stdint_u"
-+else
-+ ac_cv_header_stdint="stddef.h"
-+fi
-+
-+AC_MSG_CHECKING([for extra inttypes in chosen header])
-+AC_MSG_RESULT([($ac_cv_header_stdint)])
-+dnl see if int_least and int_fast types are present in _this_ header.
-+unset ac_cv_type_int_least32_t
-+unset ac_cv_type_int_fast32_t
-+AC_CHECK_TYPE(int_least32_t,,,[#include <$ac_cv_header_stdint>])
-+AC_CHECK_TYPE(int_fast32_t,,,[#include<$ac_cv_header_stdint>])
-+AC_CHECK_TYPE(intmax_t,,,[#include <$ac_cv_header_stdint>])
-+
-+fi # shortcircut to system "stdint.h"
-+# ------------------ PREPARE VARIABLES ------------------------------
-+if test "$GCC" = "yes" ; then
-+ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1`
-+else
-+ac_cv_stdint_message="using $CC"
-+fi
-+
-+AC_MSG_RESULT([make use of $ac_cv_header_stdint in $ac_stdint_h dnl
-+$ac_cv_stdint_result])
-+
-+dnl -----------------------------------------------------------------
-+# ----------------- DONE inttypes.h checks START header -------------
-+AC_CONFIG_COMMANDS([$ac_stdint_h],[
-+AC_MSG_NOTICE(creating $ac_stdint_h : $_ac_stdint_h)
-+ac_stdint=$tmp/_stdint.h
-+
-+echo "#ifndef" $_ac_stdint_h >$ac_stdint
-+echo "#define" $_ac_stdint_h "1" >>$ac_stdint
-+echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint
-+echo "#define" _GENERATED_STDINT_H '"'$PACKAGE $VERSION'"' >>$ac_stdint
-+echo "/* generated $ac_cv_stdint_message */" >>$ac_stdint
-+if test "_$ac_cv_header_stdint_t" != "_" ; then
-+echo "#define _STDINT_HAVE_STDINT_H" "1" >>$ac_stdint
-+echo "#include <stdint.h>" >>$ac_stdint
-+echo "#endif" >>$ac_stdint
-+echo "#endif" >>$ac_stdint
-+else
-+
-+cat >>$ac_stdint <<STDINT_EOF
-+
-+/* ................... shortcircuit part ........................... */
-+
-+#if defined HAVE_STDINT_H || defined _STDINT_HAVE_STDINT_H
-+#include <stdint.h>
-+#else
-+#include <stddef.h>
-+
-+/* .................... configured part ............................ */
-+
-+STDINT_EOF
-+
-+echo "/* whether we have a C99 compatible stdint header file */" >>$ac_stdint
-+if test "_$ac_cv_header_stdint_x" != "_" ; then
-+ ac_header="$ac_cv_header_stdint_x"
-+ echo "#define _STDINT_HEADER_INTPTR" '"'"$ac_header"'"' >>$ac_stdint
-+else
-+ echo "/* #undef _STDINT_HEADER_INTPTR */" >>$ac_stdint
-+fi
-+
-+echo "/* whether we have a C96 compatible inttypes header file */" >>$ac_stdint
-+if test "_$ac_cv_header_stdint_o" != "_" ; then
-+ ac_header="$ac_cv_header_stdint_o"
-+ echo "#define _STDINT_HEADER_UINT32" '"'"$ac_header"'"' >>$ac_stdint
-+else
-+ echo "/* #undef _STDINT_HEADER_UINT32 */" >>$ac_stdint
-+fi
-+
-+echo "/* whether we have a BSD compatible inet types header */" >>$ac_stdint
-+if test "_$ac_cv_header_stdint_u" != "_" ; then
-+ ac_header="$ac_cv_header_stdint_u"
-+ echo "#define _STDINT_HEADER_U_INT32" '"'"$ac_header"'"' >>$ac_stdint
-+else
-+ echo "/* #undef _STDINT_HEADER_U_INT32 */" >>$ac_stdint
-+fi
-+
-+echo "" >>$ac_stdint
-+
-+if test "_$ac_header" != "_" ; then if test "$ac_header" != "stddef.h" ; then
-+ echo "#include <$ac_header>" >>$ac_stdint
-+ echo "" >>$ac_stdint
-+fi fi
-+
-+echo "/* which 64bit typedef has been found */" >>$ac_stdint
-+if test "$ac_cv_type_uint64_t" = "yes" ; then
-+echo "#define _STDINT_HAVE_UINT64_T" "1" >>$ac_stdint
-+else
-+echo "/* #undef _STDINT_HAVE_UINT64_T */" >>$ac_stdint
-+fi
-+if test "$ac_cv_type_u_int64_t" = "yes" ; then
-+echo "#define _STDINT_HAVE_U_INT64_T" "1" >>$ac_stdint
-+else
-+echo "/* #undef _STDINT_HAVE_U_INT64_T */" >>$ac_stdint
-+fi
-+echo "" >>$ac_stdint
-+
-+echo "/* which type model has been detected */" >>$ac_stdint
-+if test "_$ac_cv_char_data_model" != "_" ; then
-+echo "#define _STDINT_CHAR_MODEL" "$ac_cv_char_data_model" >>$ac_stdint
-+echo "#define _STDINT_LONG_MODEL" "$ac_cv_long_data_model" >>$ac_stdint
-+else
-+echo "/* #undef _STDINT_CHAR_MODEL // skipped */" >>$ac_stdint
-+echo "/* #undef _STDINT_LONG_MODEL // skipped */" >>$ac_stdint
-+fi
-+echo "" >>$ac_stdint
-+
-+echo "/* whether int_least types were detected */" >>$ac_stdint
-+if test "$ac_cv_type_int_least32_t" = "yes"; then
-+echo "#define _STDINT_HAVE_INT_LEAST32_T" "1" >>$ac_stdint
-+else
-+echo "/* #undef _STDINT_HAVE_INT_LEAST32_T */" >>$ac_stdint
-+fi
-+echo "/* whether int_fast types were detected */" >>$ac_stdint
-+if test "$ac_cv_type_int_fast32_t" = "yes"; then
-+echo "#define _STDINT_HAVE_INT_FAST32_T" "1" >>$ac_stdint
-+else
-+echo "/* #undef _STDINT_HAVE_INT_FAST32_T */" >>$ac_stdint
-+fi
-+echo "/* whether intmax_t type was detected */" >>$ac_stdint
-+if test "$ac_cv_type_intmax_t" = "yes"; then
-+echo "#define _STDINT_HAVE_INTMAX_T" "1" >>$ac_stdint
-+else
-+echo "/* #undef _STDINT_HAVE_INTMAX_T */" >>$ac_stdint
-+fi
-+echo "" >>$ac_stdint
-+
-+ cat >>$ac_stdint <<STDINT_EOF
-+/* .................... detections part ............................ */
-+
-+/* whether we need to define bitspecific types from compiler base types */
-+#ifndef _STDINT_HEADER_INTPTR
-+#ifndef _STDINT_HEADER_UINT32
-+#ifndef _STDINT_HEADER_U_INT32
-+#define _STDINT_NEED_INT_MODEL_T
-+#else
-+#define _STDINT_HAVE_U_INT_TYPES
-+#endif
-+#endif
-+#endif
-+
-+#ifdef _STDINT_HAVE_U_INT_TYPES
-+#undef _STDINT_NEED_INT_MODEL_T
-+#endif
-+
-+#ifdef _STDINT_CHAR_MODEL
-+#if _STDINT_CHAR_MODEL+0 == 122 || _STDINT_CHAR_MODEL+0 == 124
-+#ifndef _STDINT_BYTE_MODEL
-+#define _STDINT_BYTE_MODEL 12
-+#endif
-+#endif
-+#endif
-+
-+#ifndef _STDINT_HAVE_INT_LEAST32_T
-+#define _STDINT_NEED_INT_LEAST_T
-+#endif
-+
-+#ifndef _STDINT_HAVE_INT_FAST32_T
-+#define _STDINT_NEED_INT_FAST_T
-+#endif
-+
-+#ifndef _STDINT_HEADER_INTPTR
-+#define _STDINT_NEED_INTPTR_T
-+#ifndef _STDINT_HAVE_INTMAX_T
-+#define _STDINT_NEED_INTMAX_T
-+#endif
-+#endif
-+
-+
-+/* .................... definition part ............................ */
-+
-+/* some system headers have good uint64_t */
-+#ifndef _HAVE_UINT64_T
-+#if defined _STDINT_HAVE_UINT64_T || defined HAVE_UINT64_T
-+#define _HAVE_UINT64_T
-+#elif defined _STDINT_HAVE_U_INT64_T || defined HAVE_U_INT64_T
-+#define _HAVE_UINT64_T
-+typedef u_int64_t uint64_t;
-+#endif
-+#endif
-+
-+#ifndef _HAVE_UINT64_T
-+/* .. here are some common heuristics using compiler runtime specifics */
-+#if defined __STDC_VERSION__ && defined __STDC_VERSION__ >= 199901L
-+#define _HAVE_UINT64_T
-+#define _HAVE_LONGLONG_UINT64_T
-+typedef long long int64_t;
-+typedef unsigned long long uint64_t;
-+
-+#elif !defined __STRICT_ANSI__
-+#if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__
-+#define _HAVE_UINT64_T
-+typedef __int64 int64_t;
-+typedef unsigned __int64 uint64_t;
-+
-+#elif defined __GNUC__ || defined __MWERKS__ || defined __ELF__
-+/* note: all ELF-systems seem to have loff-support which needs 64-bit */
-+#if !defined _NO_LONGLONG
-+#define _HAVE_UINT64_T
-+#define _HAVE_LONGLONG_UINT64_T
-+typedef long long int64_t;
-+typedef unsigned long long uint64_t;
-+#endif
-+
-+#elif defined __alpha || (defined __mips && defined _ABIN32)
-+#if !defined _NO_LONGLONG
-+typedef long int64_t;
-+typedef unsigned long uint64_t;
-+#endif
-+ /* compiler/cpu type to define int64_t */
-+#endif
-+#endif
-+#endif
-+
-+#if defined _STDINT_HAVE_U_INT_TYPES
-+/* int8_t int16_t int32_t defined by inet code, redeclare the u_intXX types */
-+typedef u_int8_t uint8_t;
-+typedef u_int16_t uint16_t;
-+typedef u_int32_t uint32_t;
-+
-+/* glibc compatibility */
-+#ifndef __int8_t_defined
-+#define __int8_t_defined
-+#endif
-+#endif
-+
-+#ifdef _STDINT_NEED_INT_MODEL_T
-+/* we must guess all the basic types. Apart from byte-adressable system, */
-+/* there a few 32-bit-only dsp-systems that we guard with BYTE_MODEL 8-} */
-+/* (btw, those nibble-addressable systems are way off, or so we assume) */
-+
-+dnl /* have a look at "64bit and data size neutrality" at */
-+dnl /* http://unix.org/version2/whatsnew/login_64bit.html */
-+dnl /* (the shorthand "ILP" types always have a "P" part) */
-+
-+#if defined _STDINT_BYTE_MODEL
-+#if _STDINT_LONG_MODEL+0 == 242
-+/* 2:4:2 = IP16 = a normal 16-bit system */
-+typedef unsigned char uint8_t;
-+typedef unsigned short uint16_t;
-+typedef unsigned long uint32_t;
-+#ifndef __int8_t_defined
-+#define __int8_t_defined
-+typedef char int8_t;
-+typedef short int16_t;
-+typedef long int32_t;
-+#endif
-+#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL == 444
-+/* 2:4:4 = LP32 = a 32-bit system derived from a 16-bit */
-+/* 4:4:4 = ILP32 = a normal 32-bit system */
-+typedef unsigned char uint8_t;
-+typedef unsigned short uint16_t;
-+typedef unsigned int uint32_t;
-+#ifndef __int8_t_defined
-+#define __int8_t_defined
-+typedef char int8_t;
-+typedef short int16_t;
-+typedef int int32_t;
-+#endif
-+#elif _STDINT_LONG_MODEL+0 == 484 || _STDINT_LONG_MODEL+0 == 488
-+/* 4:8:4 = IP32 = a 32-bit system prepared for 64-bit */
-+/* 4:8:8 = LP64 = a normal 64-bit system */
-+typedef unsigned char uint8_t;
-+typedef unsigned short uint16_t;
-+typedef unsigned int uint32_t;
-+#ifndef __int8_t_defined
-+#define __int8_t_defined
-+typedef char int8_t;
-+typedef short int16_t;
-+typedef int int32_t;
-+#endif
-+/* this system has a "long" of 64bit */
-+#ifndef _HAVE_UINT64_T
-+#define _HAVE_UINT64_T
-+typedef unsigned long uint64_t;
-+typedef long int64_t;
-+#endif
-+#elif _STDINT_LONG_MODEL+0 == 448
-+/* LLP64 a 64-bit system derived from a 32-bit system */
-+typedef unsigned char uint8_t;
-+typedef unsigned short uint16_t;
-+typedef unsigned int uint32_t;
-+#ifndef __int8_t_defined
-+#define __int8_t_defined
-+typedef char int8_t;
-+typedef short int16_t;
-+typedef int int32_t;
-+#endif
-+/* assuming the system has a "long long" */
-+#ifndef _HAVE_UINT64_T
-+#define _HAVE_UINT64_T
-+#define _HAVE_LONGLONG_UINT64_T
-+typedef unsigned long long uint64_t;
-+typedef long long int64_t;
-+#endif
-+#else
-+#define _STDINT_NO_INT32_T
-+#endif
-+#else
-+#define _STDINT_NO_INT8_T
-+#define _STDINT_NO_INT32_T
-+#endif
-+#endif
-+
-+/*
-+ * quote from SunOS-5.8 sys/inttypes.h:
-+ * Use at your own risk. As of February 1996, the committee is squarely
-+ * behind the fixed sized types; the "least" and "fast" types are still being
-+ * discussed. The probability that the "fast" types may be removed before
-+ * the standard is finalized is high enough that they are not currently
-+ * implemented.
-+ */
-+
-+#if defined _STDINT_NEED_INT_LEAST_T
-+typedef int8_t int_least8_t;
-+typedef int16_t int_least16_t;
-+typedef int32_t int_least32_t;
-+#ifdef _HAVE_UINT64_T
-+typedef int64_t int_least64_t;
-+#endif
-+
-+typedef uint8_t uint_least8_t;
-+typedef uint16_t uint_least16_t;
-+typedef uint32_t uint_least32_t;
-+#ifdef _HAVE_UINT64_T
-+typedef uint64_t uint_least64_t;
-+#endif
-+ /* least types */
-+#endif
-+
-+#if defined _STDINT_NEED_INT_FAST_T
-+typedef int8_t int_fast8_t;
-+typedef int int_fast16_t;
-+typedef int32_t int_fast32_t;
-+#ifdef _HAVE_UINT64_T
-+typedef int64_t int_fast64_t;
-+#endif
-+
-+typedef uint8_t uint_fast8_t;
-+typedef unsigned uint_fast16_t;
-+typedef uint32_t uint_fast32_t;
-+#ifdef _HAVE_UINT64_T
-+typedef uint64_t uint_fast64_t;
-+#endif
-+ /* fast types */
-+#endif
-+
-+#ifdef _STDINT_NEED_INTMAX_T
-+#ifdef _HAVE_UINT64_T
-+typedef int64_t intmax_t;
-+typedef uint64_t uintmax_t;
-+#else
-+typedef long intmax_t;
-+typedef unsigned long uintmax_t;
-+#endif
-+#endif
-+
-+#ifdef _STDINT_NEED_INTPTR_T
-+#ifndef __intptr_t_defined
-+#define __intptr_t_defined
-+/* we encourage using "long" to store pointer values, never use "int" ! */
-+#if _STDINT_LONG_MODEL+0 == 242 || _STDINT_LONG_MODEL+0 == 484
-+typedef unsinged int uintptr_t;
-+typedef int intptr_t;
-+#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL+0 == 444
-+typedef unsigned long uintptr_t;
-+typedef long intptr_t;
-+#elif _STDINT_LONG_MODEL+0 == 448 && defined _HAVE_UINT64_T
-+typedef uint64_t uintptr_t;
-+typedef int64_t intptr_t;
-+#else /* matches typical system types ILP32 and LP64 - but not IP16 or LLP64 */
-+typedef unsigned long uintptr_t;
-+typedef long intptr_t;
-+#endif
-+#endif
-+#endif
-+
-+/* The ISO C99 standard specifies that in C++ implementations these
-+ should only be defined if explicitly requested. */
-+#if !defined __cplusplus || defined __STDC_CONSTANT_MACROS
-+#ifndef UINT32_C
-+
-+/* Signed. */
-+# define INT8_C(c) c
-+# define INT16_C(c) c
-+# define INT32_C(c) c
-+# ifdef _HAVE_LONGLONG_UINT64_T
-+# define INT64_C(c) c ## L
-+# else
-+# define INT64_C(c) c ## LL
-+# endif
-+
-+/* Unsigned. */
-+# define UINT8_C(c) c ## U
-+# define UINT16_C(c) c ## U
-+# define UINT32_C(c) c ## U
-+# ifdef _HAVE_LONGLONG_UINT64_T
-+# define UINT64_C(c) c ## UL
-+# else
-+# define UINT64_C(c) c ## ULL
-+# endif
-+
-+/* Maximal type. */
-+# ifdef _HAVE_LONGLONG_UINT64_T
-+# define INTMAX_C(c) c ## L
-+# define UINTMAX_C(c) c ## UL
-+# else
-+# define INTMAX_C(c) c ## LL
-+# define UINTMAX_C(c) c ## ULL
-+# endif
-+
-+ /* literalnumbers */
-+#endif
-+#endif
-+
-+/* These limits are merily those of a two complement byte-oriented system */
-+
-+/* Minimum of signed integral types. */
-+# define INT8_MIN (-128)
-+# define INT16_MIN (-32767-1)
-+# define INT32_MIN (-2147483647-1)
-+# define INT64_MIN (-__INT64_C(9223372036854775807)-1)
-+/* Maximum of signed integral types. */
-+# define INT8_MAX (127)
-+# define INT16_MAX (32767)
-+# define INT32_MAX (2147483647)
-+# define INT64_MAX (__INT64_C(9223372036854775807))
-+
-+/* Maximum of unsigned integral types. */
-+# define UINT8_MAX (255)
-+# define UINT16_MAX (65535)
-+# define UINT32_MAX (4294967295U)
-+# define UINT64_MAX (__UINT64_C(18446744073709551615))
-+
-+/* Minimum of signed integral types having a minimum size. */
-+# define INT_LEAST8_MIN INT8_MIN
-+# define INT_LEAST16_MIN INT16_MIN
-+# define INT_LEAST32_MIN INT32_MIN
-+# define INT_LEAST64_MIN INT64_MIN
-+/* Maximum of signed integral types having a minimum size. */
-+# define INT_LEAST8_MAX INT8_MAX
-+# define INT_LEAST16_MAX INT16_MAX
-+# define INT_LEAST32_MAX INT32_MAX
-+# define INT_LEAST64_MAX INT64_MAX
-+
-+/* Maximum of unsigned integral types having a minimum size. */
-+# define UINT_LEAST8_MAX UINT8_MAX
-+# define UINT_LEAST16_MAX UINT16_MAX
-+# define UINT_LEAST32_MAX UINT32_MAX
-+# define UINT_LEAST64_MAX UINT64_MAX
-+
-+ /* shortcircuit*/
-+#endif
-+ /* once */
-+#endif
-+#endif
-+STDINT_EOF
-+fi
-+ if cmp -s $ac_stdint_h $ac_stdint 2>/dev/null; then
-+ AC_MSG_NOTICE([$ac_stdint_h is unchanged])
-+ else
-+ ac_dir=`AS_DIRNAME(["$ac_stdint_h"])`
-+ AS_MKDIR_P(["$ac_dir"])
-+ rm -f $ac_stdint_h
-+ mv $ac_stdint $ac_stdint_h
-+ fi
-+],[# variables for create stdint.h replacement
-+PACKAGE="$PACKAGE"
-+VERSION="$VERSION"
-+ac_stdint_h="$ac_stdint_h"
-+_ac_stdint_h=AS_TR_CPP(_$PACKAGE-$ac_stdint_h)
-+ac_cv_stdint_message="$ac_cv_stdint_message"
-+ac_cv_header_stdint_t="$ac_cv_header_stdint_t"
-+ac_cv_header_stdint_x="$ac_cv_header_stdint_x"
-+ac_cv_header_stdint_o="$ac_cv_header_stdint_o"
-+ac_cv_header_stdint_u="$ac_cv_header_stdint_u"
-+ac_cv_type_uint64_t="$ac_cv_type_uint64_t"
-+ac_cv_type_u_int64_t="$ac_cv_type_u_int64_t"
-+ac_cv_char_data_model="$ac_cv_char_data_model"
-+ac_cv_long_data_model="$ac_cv_long_data_model"
-+ac_cv_type_int_least32_t="$ac_cv_type_int_least32_t"
-+ac_cv_type_int_fast32_t="$ac_cv_type_int_fast32_t"
-+ac_cv_type_intmax_t="$ac_cv_type_intmax_t"
-+])
-+])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/sane-backends.git/commitdiff/85f489c50e85a6c3a9a9fc8ed4b244db228b0ea3
More information about the pld-cvs-commit
mailing list