[BACK]Return to stdint.m4 CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / libiconv / srcm4

Diff for /embedaddon/libiconv/srcm4/stdint.m4 between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 22:57:49 version 1.1.1.2, 2012/05/29 09:29:44
Line 1 Line 1
# stdint.m4 serial 34# stdint.m4 serial 41
dnl Copyright (C) 2001-2009 Free Software Foundation, Inc.dnl Copyright (C) 2001-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation  dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,  dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.  dnl with or without modifications, as long as this notice is preserved.
Line 7  dnl with or without modifications, as long as this not Line 7  dnl with or without modifications, as long as this not
 dnl From Paul Eggert and Bruno Haible.  dnl From Paul Eggert and Bruno Haible.
 dnl Test whether <stdint.h> is supported or must be substituted.  dnl Test whether <stdint.h> is supported or must be substituted.
   
AC_DEFUN([gl_STDINT_H],AC_DEFUN_ONCE([gl_STDINT_H],
 [  [
   AC_PREREQ([2.59])dnl    AC_PREREQ([2.59])dnl
   
Line 27  AC_DEFUN([gl_STDINT_H], Line 27  AC_DEFUN([gl_STDINT_H],
   fi    fi
   AC_SUBST([HAVE_UNSIGNED_LONG_LONG_INT])    AC_SUBST([HAVE_UNSIGNED_LONG_LONG_INT])
   
     dnl Check for <wchar.h>, in the same way as gl_WCHAR_H does.
     AC_CHECK_HEADERS_ONCE([wchar.h])
     if test $ac_cv_header_wchar_h = yes; then
       HAVE_WCHAR_H=1
     else
       HAVE_WCHAR_H=0
     fi
     AC_SUBST([HAVE_WCHAR_H])
   
   dnl Check for <inttypes.h>.    dnl Check for <inttypes.h>.
   dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_inttypes_h.    dnl AC_INCLUDES_DEFAULT defines $ac_cv_header_inttypes_h.
   if test $ac_cv_header_inttypes_h = yes; then    if test $ac_cv_header_inttypes_h = yes; then
Line 145  uintmax_t j = UINTMAX_MAX; Line 154  uintmax_t j = UINTMAX_MAX;
   
 #include <limits.h> /* for CHAR_BIT */  #include <limits.h> /* for CHAR_BIT */
 #define TYPE_MINIMUM(t) \  #define TYPE_MINIMUM(t) \
  ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))  ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t)))
 #define TYPE_MAXIMUM(t) \  #define TYPE_MAXIMUM(t) \
  ((t) ((t) 0 < (t) -1 ? (t) -1 : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1))))  ((t) ((t) 0 < (t) -1 \
         ? (t) -1 \
         : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
 struct s {  struct s {
   int check_PTRDIFF:    int check_PTRDIFF:
       PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)        PTRDIFF_MIN == TYPE_MINIMUM (ptrdiff_t)
Line 259  static const char *macro_values[] = Line 270  static const char *macro_values[] =
           || strncmp (value, "((int)"/*)*/, 6) == 0            || strncmp (value, "((int)"/*)*/, 6) == 0
           || strncmp (value, "((signed short)"/*)*/, 15) == 0            || strncmp (value, "((signed short)"/*)*/, 15) == 0
           || strncmp (value, "((signed char)"/*)*/, 14) == 0)            || strncmp (value, "((signed char)"/*)*/, 14) == 0)
        return 1;        return mv - macro_values + 1;
     }      }
   return 0;    return 0;
 ]])],  ]])],
Line 290  static const char *macro_values[] = Line 301  static const char *macro_values[] =
     fi      fi
     AC_SUBST([HAVE_SYS_BITYPES_H])      AC_SUBST([HAVE_SYS_BITYPES_H])
   
     dnl Check for <wchar.h> (missing in Linux uClibc when built without wide  
     dnl character support).  
     AC_CHECK_HEADERS_ONCE([wchar.h])  
   
     gl_STDINT_TYPE_PROPERTIES      gl_STDINT_TYPE_PROPERTIES
     STDINT_H=stdint.h      STDINT_H=stdint.h
   fi    fi
   AC_SUBST([STDINT_H])    AC_SUBST([STDINT_H])
     AM_CONDITIONAL([GL_GENERATE_STDINT_H], [test -n "$STDINT_H"])
 ])  ])
   
 dnl gl_STDINT_BITSIZEOF(TYPES, INCLUDES)  dnl gl_STDINT_BITSIZEOF(TYPES, INCLUDES)
Line 309  AC_DEFUN([gl_STDINT_BITSIZEOF], Line 317  AC_DEFUN([gl_STDINT_BITSIZEOF],
   dnl   config.h.in,    dnl   config.h.in,
   dnl - extra AC_SUBST calls, so that the right substitutions are made.    dnl - extra AC_SUBST calls, so that the right substitutions are made.
   m4_foreach_w([gltype], [$1],    m4_foreach_w([gltype], [$1],
    [AH_TEMPLATE([BITSIZEOF_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),    [AH_TEMPLATE([BITSIZEOF_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
        [Define to the number of bits in type ']gltype['.])])         [Define to the number of bits in type ']gltype['.])])
   for gltype in $1 ; do    for gltype in $1 ; do
     AC_CACHE_CHECK([for bit size of $gltype], [gl_cv_bitsizeof_${gltype}],      AC_CACHE_CHECK([for bit size of $gltype], [gl_cv_bitsizeof_${gltype}],
Line 334  AC_DEFUN([gl_STDINT_BITSIZEOF], Line 342  AC_DEFUN([gl_STDINT_BITSIZEOF],
     eval BITSIZEOF_${GLTYPE}=\$result      eval BITSIZEOF_${GLTYPE}=\$result
   done    done
   m4_foreach_w([gltype], [$1],    m4_foreach_w([gltype], [$1],
    [AC_SUBST([BITSIZEOF_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])    [AC_SUBST([BITSIZEOF_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
 ])  ])
   
 dnl gl_CHECK_TYPES_SIGNED(TYPES, INCLUDES)  dnl gl_CHECK_TYPES_SIGNED(TYPES, INCLUDES)
Line 347  AC_DEFUN([gl_CHECK_TYPES_SIGNED], Line 355  AC_DEFUN([gl_CHECK_TYPES_SIGNED],
   dnl   config.h.in,    dnl   config.h.in,
   dnl - extra AC_SUBST calls, so that the right substitutions are made.    dnl - extra AC_SUBST calls, so that the right substitutions are made.
   m4_foreach_w([gltype], [$1],    m4_foreach_w([gltype], [$1],
    [AH_TEMPLATE([HAVE_SIGNED_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),    [AH_TEMPLATE([HAVE_SIGNED_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]),
        [Define to 1 if ']gltype[' is a signed integer type.])])         [Define to 1 if ']gltype[' is a signed integer type.])])
   for gltype in $1 ; do    for gltype in $1 ; do
     AC_CACHE_CHECK([whether $gltype is signed], [gl_cv_type_${gltype}_signed],      AC_CACHE_CHECK([whether $gltype is signed], [gl_cv_type_${gltype}_signed],
Line 367  AC_DEFUN([gl_CHECK_TYPES_SIGNED], Line 375  AC_DEFUN([gl_CHECK_TYPES_SIGNED],
     fi      fi
   done    done
   m4_foreach_w([gltype], [$1],    m4_foreach_w([gltype], [$1],
    [AC_SUBST([HAVE_SIGNED_]translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])    [AC_SUBST([HAVE_SIGNED_]m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_]))])
 ])  ])
   
 dnl gl_INTEGER_TYPE_SUFFIX(TYPES, INCLUDES)  dnl gl_INTEGER_TYPE_SUFFIX(TYPES, INCLUDES)
Line 380  AC_DEFUN([gl_INTEGER_TYPE_SUFFIX], Line 388  AC_DEFUN([gl_INTEGER_TYPE_SUFFIX],
   dnl   config.h.in,    dnl   config.h.in,
   dnl - extra AC_SUBST calls, so that the right substitutions are made.    dnl - extra AC_SUBST calls, so that the right substitutions are made.
   m4_foreach_w([gltype], [$1],    m4_foreach_w([gltype], [$1],
    [AH_TEMPLATE(translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX],    [AH_TEMPLATE(m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX],
        [Define to l, ll, u, ul, ull, etc., as suitable for         [Define to l, ll, u, ul, ull, etc., as suitable for
         constants of type ']gltype['.])])          constants of type ']gltype['.])])
   for gltype in $1 ; do    for gltype in $1 ; do
Line 396  AC_DEFUN([gl_INTEGER_TYPE_SUFFIX], Line 404  AC_DEFUN([gl_INTEGER_TYPE_SUFFIX],
        for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do         for glsuf in "$glsufu" ${glsufu}l ${glsufu}ll ${glsufu}i64; do
          case $glsuf in           case $glsuf in
            '')  gltype1='int';;             '')  gltype1='int';;
           l)        gltype1='long int';;           l)   gltype1='long int';;
           ll)  gltype1='long long int';;           ll)  gltype1='long long int';;
           i64) gltype1='__int64';;           i64) gltype1='__int64';;
           u)   gltype1='unsigned int';;           u)   gltype1='unsigned int';;
           ul)  gltype1='unsigned long int';;           ul)  gltype1='unsigned long int';;
           ull) gltype1='unsigned long long int';;           ull) gltype1='unsigned long long int';;
            ui64)gltype1='unsigned __int64';;             ui64)gltype1='unsigned __int64';;
          esac           esac
          AC_COMPILE_IFELSE(           AC_COMPILE_IFELSE(
Line 419  AC_DEFUN([gl_INTEGER_TYPE_SUFFIX], Line 427  AC_DEFUN([gl_INTEGER_TYPE_SUFFIX],
     AC_DEFINE_UNQUOTED([${GLTYPE}_SUFFIX], [$result])      AC_DEFINE_UNQUOTED([${GLTYPE}_SUFFIX], [$result])
   done    done
   m4_foreach_w([gltype], [$1],    m4_foreach_w([gltype], [$1],
    [AC_SUBST(translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX])])    [AC_SUBST(m4_translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX])])
 ])  ])
   
 dnl gl_STDINT_INCLUDES  dnl gl_STDINT_INCLUDES
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>