Skip to content

R
riscv-gcc-1
Commit b9497ab5 by Rainer Orth Committed by Rainer Orth
Options

stdint.m4 (GCC_HEADER_STDINT): Don't typedef uint8_t etc. 

	config:
	* stdint.m4 (GCC_HEADER_STDINT): Don't typedef uint8_t etc. if
	corresponding macros already exist.

	libdecnumber:
	* configure: Regenerate.

	libgfortran:
	* configure: Regenerate.

	libgomp:
	* configure: Regenerate.

	libstdc++-v3:
	* configure: Regenerate.

From-SVN: r155648
parent 82aee923
Showing with 241 additions and 0 deletions
config/ChangeLog
2010-01-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* stdint.m4 (GCC_HEADER_STDINT): Don't typedef uint8_t etc. if
corresponding macros already exist.
2010-01-02 Richard Guenther <rguenther@suse.de> 2010-01-02 Richard Guenther <rguenther@suse.de>
PR lto/41529 PR lto/41529
......
config/stdint.m4
...@@ -234,49 +234,61 @@ if test "$acx_cv_header_stdint" = stddef.h; then ...@@ -234,49 +234,61 @@ if test "$acx_cv_header_stdint" = stddef.h; then
#define _UINT8_T #define _UINT8_T
#ifndef __uint8_t_defined #ifndef __uint8_t_defined
#define __uint8_t_defined #define __uint8_t_defined
#ifndef uint8_t
typedef unsigned $acx_cv_type_int8_t uint8_t; typedef unsigned $acx_cv_type_int8_t uint8_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT16_T #ifndef _UINT16_T
#define _UINT16_T #define _UINT16_T
#ifndef __uint16_t_defined #ifndef __uint16_t_defined
#define __uint16_t_defined #define __uint16_t_defined
#ifndef uint16_t
typedef unsigned $acx_cv_type_int16_t uint16_t; typedef unsigned $acx_cv_type_int16_t uint16_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT32_T #ifndef _UINT32_T
#define _UINT32_T #define _UINT32_T
#ifndef __uint32_t_defined #ifndef __uint32_t_defined
#define __uint32_t_defined #define __uint32_t_defined
#ifndef uint32_t
typedef unsigned $acx_cv_type_int32_t uint32_t; typedef unsigned $acx_cv_type_int32_t uint32_t;
#endif #endif
#endif #endif
#endif
#ifndef _INT8_T #ifndef _INT8_T
#define _INT8_T #define _INT8_T
#ifndef __int8_t_defined #ifndef __int8_t_defined
#define __int8_t_defined #define __int8_t_defined
#ifndef int8_t
typedef $acx_cv_type_int8_t int8_t; typedef $acx_cv_type_int8_t int8_t;
#endif #endif
#endif #endif
#endif
#ifndef _INT16_T #ifndef _INT16_T
#define _INT16_T #define _INT16_T
#ifndef __int16_t_defined #ifndef __int16_t_defined
#define __int16_t_defined #define __int16_t_defined
#ifndef int16_t
typedef $acx_cv_type_int16_t int16_t; typedef $acx_cv_type_int16_t int16_t;
#endif #endif
#endif #endif
#endif
#ifndef _INT32_T #ifndef _INT32_T
#define _INT32_T #define _INT32_T
#ifndef __int32_t_defined #ifndef __int32_t_defined
#define __int32_t_defined #define __int32_t_defined
#ifndef int32_t
typedef $acx_cv_type_int32_t int32_t; typedef $acx_cv_type_int32_t int32_t;
#endif #endif
#endif #endif
#endif
EOF EOF
elif test "$ac_cv_type_u_int32_t" = yes; then elif test "$ac_cv_type_u_int32_t" = yes; then
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
...@@ -296,25 +308,31 @@ elif test "$ac_cv_type_u_int32_t" = yes; then ...@@ -296,25 +308,31 @@ elif test "$ac_cv_type_u_int32_t" = yes; then
#define _UINT8_T #define _UINT8_T
#ifndef __uint8_t_defined #ifndef __uint8_t_defined
#define __uint8_t_defined #define __uint8_t_defined
#ifndef uint8_t
typedef u_int8_t uint8_t; typedef u_int8_t uint8_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT16_T #ifndef _UINT16_T
#define _UINT16_T #define _UINT16_T
#ifndef __uint16_t_defined #ifndef __uint16_t_defined
#define __uint16_t_defined #define __uint16_t_defined
#ifndef uint16_t
typedef u_int16_t uint16_t; typedef u_int16_t uint16_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT32_T #ifndef _UINT32_T
#define _UINT32_T #define _UINT32_T
#ifndef __uint32_t_defined #ifndef __uint32_t_defined
#define __uint32_t_defined #define __uint32_t_defined
#ifndef uint32_t
typedef u_int32_t uint32_t; typedef u_int32_t uint32_t;
#endif #endif
#endif #endif
#endif
EOF EOF
else else
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
...@@ -364,9 +382,11 @@ elif test "$ac_cv_type_u_int64_t" = yes; then ...@@ -364,9 +382,11 @@ elif test "$ac_cv_type_u_int64_t" = yes; then
#define _UINT64_T #define _UINT64_T
#ifndef __uint64_t_defined #ifndef __uint64_t_defined
#define __uint64_t_defined #define __uint64_t_defined
#ifndef uint64_t
typedef u_int64_t uint64_t; typedef u_int64_t uint64_t;
#endif #endif
#endif #endif
#endif
EOF EOF
elif test -n "$acx_cv_type_int64_t"; then elif test -n "$acx_cv_type_int64_t"; then
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
...@@ -374,15 +394,19 @@ elif test -n "$acx_cv_type_int64_t"; then ...@@ -374,15 +394,19 @@ elif test -n "$acx_cv_type_int64_t"; then
/* architecture has a 64-bit type, $acx_cv_type_int64_t */ /* architecture has a 64-bit type, $acx_cv_type_int64_t */
#ifndef _INT64_T #ifndef _INT64_T
#define _INT64_T #define _INT64_T
#ifndef int64_t
typedef $acx_cv_type_int64_t int64_t; typedef $acx_cv_type_int64_t int64_t;
#endif #endif
#endif
#ifndef _UINT64_T #ifndef _UINT64_T
#define _UINT64_T #define _UINT64_T
#ifndef __uint64_t_defined #ifndef __uint64_t_defined
#define __uint64_t_defined #define __uint64_t_defined
#ifndef uint64_t
typedef unsigned $acx_cv_type_int64_t uint64_t; typedef unsigned $acx_cv_type_int64_t uint64_t;
#endif #endif
#endif #endif
#endif
EOF EOF
else else
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
...@@ -392,13 +416,17 @@ else ...@@ -392,13 +416,17 @@ else
#ifndef _INT64_T #ifndef _INT64_T
#define _INT64_T #define _INT64_T
#ifndef __int64_t_defined #ifndef __int64_t_defined
#ifndef int64_t
typedef long long int64_t; typedef long long int64_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT64_T #ifndef _UINT64_T
#define _UINT64_T #define _UINT64_T
#ifndef uint64_t
typedef unsigned long long uint64_t; typedef unsigned long long uint64_t;
#endif #endif
#endif
#elif defined __GNUC__ && defined (__STDC__) && __STDC__-0 #elif defined __GNUC__ && defined (__STDC__) && __STDC__-0
/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
...@@ -410,24 +438,32 @@ else ...@@ -410,24 +438,32 @@ else
# ifndef _INT64_T # ifndef _INT64_T
# define _INT64_T # define _INT64_T
# ifndef int64_t
__extension__ typedef long long int64_t; __extension__ typedef long long int64_t;
# endif # endif
# endif
# ifndef _UINT64_T # ifndef _UINT64_T
# define _UINT64_T # define _UINT64_T
# ifndef uint64_t
__extension__ typedef unsigned long long uint64_t; __extension__ typedef unsigned long long uint64_t;
# endif # endif
# endif
#elif !defined __STRICT_ANSI__ #elif !defined __STRICT_ANSI__
# if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__ # if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__
# ifndef _INT64_T # ifndef _INT64_T
# define _INT64_T # define _INT64_T
# ifndef int64_t
typedef __int64 int64_t; typedef __int64 int64_t;
# endif # endif
# endif
# ifndef _UINT64_T # ifndef _UINT64_T
# define _UINT64_T # define _UINT64_T
# ifndef uint64_t
typedef unsigned __int64 uint64_t; typedef unsigned __int64 uint64_t;
# endif # endif
# endif
# endif /* compiler */ # endif /* compiler */
#endif /* ANSI version */ #endif /* ANSI version */
...@@ -440,11 +476,15 @@ if test "$ac_cv_type_uintptr_t" != yes; then ...@@ -440,11 +476,15 @@ if test "$ac_cv_type_uintptr_t" != yes; then
/* Define intptr_t based on sizeof(void*) = $ac_cv_sizeof_void_p */ /* Define intptr_t based on sizeof(void*) = $ac_cv_sizeof_void_p */
#ifndef __uintptr_t_defined #ifndef __uintptr_t_defined
#ifndef uintptr_t
typedef u$acx_cv_type_intptr_t uintptr_t; typedef u$acx_cv_type_intptr_t uintptr_t;
#endif #endif
#endif
#ifndef __intptr_t_defined #ifndef __intptr_t_defined
#ifndef intptr_t
typedef $acx_cv_type_intptr_t intptr_t; typedef $acx_cv_type_intptr_t intptr_t;
#endif #endif
#endif
EOF EOF
fi fi
...@@ -496,16 +536,20 @@ if test "$ac_cv_type_uintmax_t" != yes; then ...@@ -496,16 +536,20 @@ if test "$ac_cv_type_uintmax_t" != yes; then
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
/* Define intmax based on what we found */ /* Define intmax based on what we found */
#ifndef intmax_t
#ifdef _INT64_T #ifdef _INT64_T
typedef int64_t intmax_t; typedef int64_t intmax_t;
#else #else
typedef long intmax_t; typedef long intmax_t;
#endif #endif
#endif
#ifndef uintmax_t
#ifdef _UINT64_T #ifdef _UINT64_T
typedef uint64_t uintmax_t; typedef uint64_t uintmax_t;
#else #else
typedef unsigned long uintmax_t; typedef unsigned long uintmax_t;
#endif #endif
#endif
EOF EOF
fi fi
......
libdecnumber/ChangeLog
2010-01-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* configure: Regenerate.
2009-11-28 Jakub Jelinek <jakub@redhat.com> 2009-11-28 Jakub Jelinek <jakub@redhat.com>
* decContext.c (decContextTestEndian): Move adj definition into * decContext.c (decContextTestEndian): Move adj definition into
......
libdecnumber/configure
...@@ -6162,49 +6162,61 @@ if test "$acx_cv_header_stdint" = stddef.h; then ...@@ -6162,49 +6162,61 @@ if test "$acx_cv_header_stdint" = stddef.h; then
#define _UINT8_T #define _UINT8_T
#ifndef __uint8_t_defined #ifndef __uint8_t_defined
#define __uint8_t_defined #define __uint8_t_defined
#ifndef uint8_t
typedef unsigned $acx_cv_type_int8_t uint8_t; typedef unsigned $acx_cv_type_int8_t uint8_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT16_T #ifndef _UINT16_T
#define _UINT16_T #define _UINT16_T
#ifndef __uint16_t_defined #ifndef __uint16_t_defined
#define __uint16_t_defined #define __uint16_t_defined
#ifndef uint16_t
typedef unsigned $acx_cv_type_int16_t uint16_t; typedef unsigned $acx_cv_type_int16_t uint16_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT32_T #ifndef _UINT32_T
#define _UINT32_T #define _UINT32_T
#ifndef __uint32_t_defined #ifndef __uint32_t_defined
#define __uint32_t_defined #define __uint32_t_defined
#ifndef uint32_t
typedef unsigned $acx_cv_type_int32_t uint32_t; typedef unsigned $acx_cv_type_int32_t uint32_t;
#endif #endif
#endif #endif
#endif
#ifndef _INT8_T #ifndef _INT8_T
#define _INT8_T #define _INT8_T
#ifndef __int8_t_defined #ifndef __int8_t_defined
#define __int8_t_defined #define __int8_t_defined
#ifndef int8_t
typedef $acx_cv_type_int8_t int8_t; typedef $acx_cv_type_int8_t int8_t;
#endif #endif
#endif #endif
#endif
#ifndef _INT16_T #ifndef _INT16_T
#define _INT16_T #define _INT16_T
#ifndef __int16_t_defined #ifndef __int16_t_defined
#define __int16_t_defined #define __int16_t_defined
#ifndef int16_t
typedef $acx_cv_type_int16_t int16_t; typedef $acx_cv_type_int16_t int16_t;
#endif #endif
#endif #endif
#endif
#ifndef _INT32_T #ifndef _INT32_T
#define _INT32_T #define _INT32_T
#ifndef __int32_t_defined #ifndef __int32_t_defined
#define __int32_t_defined #define __int32_t_defined
#ifndef int32_t
typedef $acx_cv_type_int32_t int32_t; typedef $acx_cv_type_int32_t int32_t;
#endif #endif
#endif #endif
#endif
EOF EOF
elif test "$ac_cv_type_u_int32_t" = yes; then elif test "$ac_cv_type_u_int32_t" = yes; then
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
...@@ -6224,25 +6236,31 @@ elif test "$ac_cv_type_u_int32_t" = yes; then ...@@ -6224,25 +6236,31 @@ elif test "$ac_cv_type_u_int32_t" = yes; then
#define _UINT8_T #define _UINT8_T
#ifndef __uint8_t_defined #ifndef __uint8_t_defined
#define __uint8_t_defined #define __uint8_t_defined
#ifndef uint8_t
typedef u_int8_t uint8_t; typedef u_int8_t uint8_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT16_T #ifndef _UINT16_T
#define _UINT16_T #define _UINT16_T
#ifndef __uint16_t_defined #ifndef __uint16_t_defined
#define __uint16_t_defined #define __uint16_t_defined
#ifndef uint16_t
typedef u_int16_t uint16_t; typedef u_int16_t uint16_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT32_T #ifndef _UINT32_T
#define _UINT32_T #define _UINT32_T
#ifndef __uint32_t_defined #ifndef __uint32_t_defined
#define __uint32_t_defined #define __uint32_t_defined
#ifndef uint32_t
typedef u_int32_t uint32_t; typedef u_int32_t uint32_t;
#endif #endif
#endif #endif
#endif
EOF EOF
else else
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
...@@ -6292,9 +6310,11 @@ elif test "$ac_cv_type_u_int64_t" = yes; then ...@@ -6292,9 +6310,11 @@ elif test "$ac_cv_type_u_int64_t" = yes; then
#define _UINT64_T #define _UINT64_T
#ifndef __uint64_t_defined #ifndef __uint64_t_defined
#define __uint64_t_defined #define __uint64_t_defined
#ifndef uint64_t
typedef u_int64_t uint64_t; typedef u_int64_t uint64_t;
#endif #endif
#endif #endif
#endif
EOF EOF
elif test -n "$acx_cv_type_int64_t"; then elif test -n "$acx_cv_type_int64_t"; then
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
...@@ -6302,15 +6322,19 @@ elif test -n "$acx_cv_type_int64_t"; then ...@@ -6302,15 +6322,19 @@ elif test -n "$acx_cv_type_int64_t"; then
/* architecture has a 64-bit type, $acx_cv_type_int64_t */ /* architecture has a 64-bit type, $acx_cv_type_int64_t */
#ifndef _INT64_T #ifndef _INT64_T
#define _INT64_T #define _INT64_T
#ifndef int64_t
typedef $acx_cv_type_int64_t int64_t; typedef $acx_cv_type_int64_t int64_t;
#endif #endif
#endif
#ifndef _UINT64_T #ifndef _UINT64_T
#define _UINT64_T #define _UINT64_T
#ifndef __uint64_t_defined #ifndef __uint64_t_defined
#define __uint64_t_defined #define __uint64_t_defined
#ifndef uint64_t
typedef unsigned $acx_cv_type_int64_t uint64_t; typedef unsigned $acx_cv_type_int64_t uint64_t;
#endif #endif
#endif #endif
#endif
EOF EOF
else else
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
...@@ -6320,13 +6344,17 @@ else ...@@ -6320,13 +6344,17 @@ else
#ifndef _INT64_T #ifndef _INT64_T
#define _INT64_T #define _INT64_T
#ifndef __int64_t_defined #ifndef __int64_t_defined
#ifndef int64_t
typedef long long int64_t; typedef long long int64_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT64_T #ifndef _UINT64_T
#define _UINT64_T #define _UINT64_T
#ifndef uint64_t
typedef unsigned long long uint64_t; typedef unsigned long long uint64_t;
#endif #endif
#endif
#elif defined __GNUC__ && defined (__STDC__) && __STDC__-0 #elif defined __GNUC__ && defined (__STDC__) && __STDC__-0
/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
...@@ -6338,24 +6366,32 @@ else ...@@ -6338,24 +6366,32 @@ else
# ifndef _INT64_T # ifndef _INT64_T
# define _INT64_T # define _INT64_T
# ifndef int64_t
__extension__ typedef long long int64_t; __extension__ typedef long long int64_t;
# endif # endif
# endif
# ifndef _UINT64_T # ifndef _UINT64_T
# define _UINT64_T # define _UINT64_T
# ifndef uint64_t
__extension__ typedef unsigned long long uint64_t; __extension__ typedef unsigned long long uint64_t;
# endif # endif
# endif
#elif !defined __STRICT_ANSI__ #elif !defined __STRICT_ANSI__
# if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__ # if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__
# ifndef _INT64_T # ifndef _INT64_T
# define _INT64_T # define _INT64_T
# ifndef int64_t
typedef __int64 int64_t; typedef __int64 int64_t;
# endif # endif
# endif
# ifndef _UINT64_T # ifndef _UINT64_T
# define _UINT64_T # define _UINT64_T
# ifndef uint64_t
typedef unsigned __int64 uint64_t; typedef unsigned __int64 uint64_t;
# endif # endif
# endif
# endif /* compiler */ # endif /* compiler */
#endif /* ANSI version */ #endif /* ANSI version */
...@@ -6368,11 +6404,15 @@ if test "$ac_cv_type_uintptr_t" != yes; then ...@@ -6368,11 +6404,15 @@ if test "$ac_cv_type_uintptr_t" != yes; then
/* Define intptr_t based on sizeof(void*) = $ac_cv_sizeof_void_p */ /* Define intptr_t based on sizeof(void*) = $ac_cv_sizeof_void_p */
#ifndef __uintptr_t_defined #ifndef __uintptr_t_defined
#ifndef uintptr_t
typedef u$acx_cv_type_intptr_t uintptr_t; typedef u$acx_cv_type_intptr_t uintptr_t;
#endif #endif
#endif
#ifndef __intptr_t_defined #ifndef __intptr_t_defined
#ifndef intptr_t
typedef $acx_cv_type_intptr_t intptr_t; typedef $acx_cv_type_intptr_t intptr_t;
#endif #endif
#endif
EOF EOF
fi fi
...@@ -6422,16 +6462,20 @@ if test "$ac_cv_type_uintmax_t" != yes; then ...@@ -6422,16 +6462,20 @@ if test "$ac_cv_type_uintmax_t" != yes; then
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
/* Define intmax based on what we found */ /* Define intmax based on what we found */
#ifndef intmax_t
#ifdef _INT64_T #ifdef _INT64_T
typedef int64_t intmax_t; typedef int64_t intmax_t;
#else #else
typedef long intmax_t; typedef long intmax_t;
#endif #endif
#endif
#ifndef uintmax_t
#ifdef _UINT64_T #ifdef _UINT64_T
typedef uint64_t uintmax_t; typedef uint64_t uintmax_t;
#else #else
typedef unsigned long uintmax_t; typedef unsigned long uintmax_t;
#endif #endif
#endif
EOF EOF
fi fi
......
libgfortran/ChangeLog
2010-01-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* configure: Regenerate.
2010-01-03 Janne Blomqvist <jb@gcc.gnu.org> 2010-01-03 Janne Blomqvist <jb@gcc.gnu.org>
PR libfortran/42420 PR libfortran/42420
......
libgfortran/configure
...@@ -27623,49 +27623,61 @@ if test "$acx_cv_header_stdint" = stddef.h; then ...@@ -27623,49 +27623,61 @@ if test "$acx_cv_header_stdint" = stddef.h; then
#define _UINT8_T #define _UINT8_T
#ifndef __uint8_t_defined #ifndef __uint8_t_defined
#define __uint8_t_defined #define __uint8_t_defined
#ifndef uint8_t
typedef unsigned $acx_cv_type_int8_t uint8_t; typedef unsigned $acx_cv_type_int8_t uint8_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT16_T #ifndef _UINT16_T
#define _UINT16_T #define _UINT16_T
#ifndef __uint16_t_defined #ifndef __uint16_t_defined
#define __uint16_t_defined #define __uint16_t_defined
#ifndef uint16_t
typedef unsigned $acx_cv_type_int16_t uint16_t; typedef unsigned $acx_cv_type_int16_t uint16_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT32_T #ifndef _UINT32_T
#define _UINT32_T #define _UINT32_T
#ifndef __uint32_t_defined #ifndef __uint32_t_defined
#define __uint32_t_defined #define __uint32_t_defined
#ifndef uint32_t
typedef unsigned $acx_cv_type_int32_t uint32_t; typedef unsigned $acx_cv_type_int32_t uint32_t;
#endif #endif
#endif #endif
#endif
#ifndef _INT8_T #ifndef _INT8_T
#define _INT8_T #define _INT8_T
#ifndef __int8_t_defined #ifndef __int8_t_defined
#define __int8_t_defined #define __int8_t_defined
#ifndef int8_t
typedef $acx_cv_type_int8_t int8_t; typedef $acx_cv_type_int8_t int8_t;
#endif #endif
#endif #endif
#endif
#ifndef _INT16_T #ifndef _INT16_T
#define _INT16_T #define _INT16_T
#ifndef __int16_t_defined #ifndef __int16_t_defined
#define __int16_t_defined #define __int16_t_defined
#ifndef int16_t
typedef $acx_cv_type_int16_t int16_t; typedef $acx_cv_type_int16_t int16_t;
#endif #endif
#endif #endif
#endif
#ifndef _INT32_T #ifndef _INT32_T
#define _INT32_T #define _INT32_T
#ifndef __int32_t_defined #ifndef __int32_t_defined
#define __int32_t_defined #define __int32_t_defined
#ifndef int32_t
typedef $acx_cv_type_int32_t int32_t; typedef $acx_cv_type_int32_t int32_t;
#endif #endif
#endif #endif
#endif
EOF EOF
elif test "$ac_cv_type_u_int32_t" = yes; then elif test "$ac_cv_type_u_int32_t" = yes; then
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
...@@ -27685,25 +27697,31 @@ elif test "$ac_cv_type_u_int32_t" = yes; then ...@@ -27685,25 +27697,31 @@ elif test "$ac_cv_type_u_int32_t" = yes; then
#define _UINT8_T #define _UINT8_T
#ifndef __uint8_t_defined #ifndef __uint8_t_defined
#define __uint8_t_defined #define __uint8_t_defined
#ifndef uint8_t
typedef u_int8_t uint8_t; typedef u_int8_t uint8_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT16_T #ifndef _UINT16_T
#define _UINT16_T #define _UINT16_T
#ifndef __uint16_t_defined #ifndef __uint16_t_defined
#define __uint16_t_defined #define __uint16_t_defined
#ifndef uint16_t
typedef u_int16_t uint16_t; typedef u_int16_t uint16_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT32_T #ifndef _UINT32_T
#define _UINT32_T #define _UINT32_T
#ifndef __uint32_t_defined #ifndef __uint32_t_defined
#define __uint32_t_defined #define __uint32_t_defined
#ifndef uint32_t
typedef u_int32_t uint32_t; typedef u_int32_t uint32_t;
#endif #endif
#endif #endif
#endif
EOF EOF
else else
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
...@@ -27753,9 +27771,11 @@ elif test "$ac_cv_type_u_int64_t" = yes; then ...@@ -27753,9 +27771,11 @@ elif test "$ac_cv_type_u_int64_t" = yes; then
#define _UINT64_T #define _UINT64_T
#ifndef __uint64_t_defined #ifndef __uint64_t_defined
#define __uint64_t_defined #define __uint64_t_defined
#ifndef uint64_t
typedef u_int64_t uint64_t; typedef u_int64_t uint64_t;
#endif #endif
#endif #endif
#endif
EOF EOF
elif test -n "$acx_cv_type_int64_t"; then elif test -n "$acx_cv_type_int64_t"; then
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
...@@ -27763,15 +27783,19 @@ elif test -n "$acx_cv_type_int64_t"; then ...@@ -27763,15 +27783,19 @@ elif test -n "$acx_cv_type_int64_t"; then
/* architecture has a 64-bit type, $acx_cv_type_int64_t */ /* architecture has a 64-bit type, $acx_cv_type_int64_t */
#ifndef _INT64_T #ifndef _INT64_T
#define _INT64_T #define _INT64_T
#ifndef int64_t
typedef $acx_cv_type_int64_t int64_t; typedef $acx_cv_type_int64_t int64_t;
#endif #endif
#endif
#ifndef _UINT64_T #ifndef _UINT64_T
#define _UINT64_T #define _UINT64_T
#ifndef __uint64_t_defined #ifndef __uint64_t_defined
#define __uint64_t_defined #define __uint64_t_defined
#ifndef uint64_t
typedef unsigned $acx_cv_type_int64_t uint64_t; typedef unsigned $acx_cv_type_int64_t uint64_t;
#endif #endif
#endif #endif
#endif
EOF EOF
else else
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
...@@ -27781,13 +27805,17 @@ else ...@@ -27781,13 +27805,17 @@ else
#ifndef _INT64_T #ifndef _INT64_T
#define _INT64_T #define _INT64_T
#ifndef __int64_t_defined #ifndef __int64_t_defined
#ifndef int64_t
typedef long long int64_t; typedef long long int64_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT64_T #ifndef _UINT64_T
#define _UINT64_T #define _UINT64_T
#ifndef uint64_t
typedef unsigned long long uint64_t; typedef unsigned long long uint64_t;
#endif #endif
#endif
#elif defined __GNUC__ && defined (__STDC__) && __STDC__-0 #elif defined __GNUC__ && defined (__STDC__) && __STDC__-0
/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
...@@ -27799,24 +27827,32 @@ else ...@@ -27799,24 +27827,32 @@ else
# ifndef _INT64_T # ifndef _INT64_T
# define _INT64_T # define _INT64_T
# ifndef int64_t
__extension__ typedef long long int64_t; __extension__ typedef long long int64_t;
# endif # endif
# endif
# ifndef _UINT64_T # ifndef _UINT64_T
# define _UINT64_T # define _UINT64_T
# ifndef uint64_t
__extension__ typedef unsigned long long uint64_t; __extension__ typedef unsigned long long uint64_t;
# endif # endif
# endif
#elif !defined __STRICT_ANSI__ #elif !defined __STRICT_ANSI__
# if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__ # if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__
# ifndef _INT64_T # ifndef _INT64_T
# define _INT64_T # define _INT64_T
# ifndef int64_t
typedef __int64 int64_t; typedef __int64 int64_t;
# endif # endif
# endif
# ifndef _UINT64_T # ifndef _UINT64_T
# define _UINT64_T # define _UINT64_T
# ifndef uint64_t
typedef unsigned __int64 uint64_t; typedef unsigned __int64 uint64_t;
# endif # endif
# endif
# endif /* compiler */ # endif /* compiler */
#endif /* ANSI version */ #endif /* ANSI version */
...@@ -27829,11 +27865,15 @@ if test "$ac_cv_type_uintptr_t" != yes; then ...@@ -27829,11 +27865,15 @@ if test "$ac_cv_type_uintptr_t" != yes; then
/* Define intptr_t based on sizeof(void*) = $ac_cv_sizeof_void_p */ /* Define intptr_t based on sizeof(void*) = $ac_cv_sizeof_void_p */
#ifndef __uintptr_t_defined #ifndef __uintptr_t_defined
#ifndef uintptr_t
typedef u$acx_cv_type_intptr_t uintptr_t; typedef u$acx_cv_type_intptr_t uintptr_t;
#endif #endif
#endif
#ifndef __intptr_t_defined #ifndef __intptr_t_defined
#ifndef intptr_t
typedef $acx_cv_type_intptr_t intptr_t; typedef $acx_cv_type_intptr_t intptr_t;
#endif #endif
#endif
EOF EOF
fi fi
...@@ -27883,16 +27923,20 @@ if test "$ac_cv_type_uintmax_t" != yes; then ...@@ -27883,16 +27923,20 @@ if test "$ac_cv_type_uintmax_t" != yes; then
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
/* Define intmax based on what we found */ /* Define intmax based on what we found */
#ifndef intmax_t
#ifdef _INT64_T #ifdef _INT64_T
typedef int64_t intmax_t; typedef int64_t intmax_t;
#else #else
typedef long intmax_t; typedef long intmax_t;
#endif #endif
#endif
#ifndef uintmax_t
#ifdef _UINT64_T #ifdef _UINT64_T
typedef uint64_t uintmax_t; typedef uint64_t uintmax_t;
#else #else
typedef unsigned long uintmax_t; typedef unsigned long uintmax_t;
#endif #endif
#endif
EOF EOF
fi fi
......
libgomp/ChangeLog
2010-01-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* configure: Regenerate.
2010-01-04 H.J. Lu <hongjiu.lu@intel.com> 2010-01-04 H.J. Lu <hongjiu.lu@intel.com>
PR libgomp/42602 PR libgomp/42602
......
libgomp/configure
...@@ -18846,49 +18846,61 @@ if test "$acx_cv_header_stdint" = stddef.h; then ...@@ -18846,49 +18846,61 @@ if test "$acx_cv_header_stdint" = stddef.h; then
#define _UINT8_T #define _UINT8_T
#ifndef __uint8_t_defined #ifndef __uint8_t_defined
#define __uint8_t_defined #define __uint8_t_defined
#ifndef uint8_t
typedef unsigned $acx_cv_type_int8_t uint8_t; typedef unsigned $acx_cv_type_int8_t uint8_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT16_T #ifndef _UINT16_T
#define _UINT16_T #define _UINT16_T
#ifndef __uint16_t_defined #ifndef __uint16_t_defined
#define __uint16_t_defined #define __uint16_t_defined
#ifndef uint16_t
typedef unsigned $acx_cv_type_int16_t uint16_t; typedef unsigned $acx_cv_type_int16_t uint16_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT32_T #ifndef _UINT32_T
#define _UINT32_T #define _UINT32_T
#ifndef __uint32_t_defined #ifndef __uint32_t_defined
#define __uint32_t_defined #define __uint32_t_defined
#ifndef uint32_t
typedef unsigned $acx_cv_type_int32_t uint32_t; typedef unsigned $acx_cv_type_int32_t uint32_t;
#endif #endif
#endif #endif
#endif
#ifndef _INT8_T #ifndef _INT8_T
#define _INT8_T #define _INT8_T
#ifndef __int8_t_defined #ifndef __int8_t_defined
#define __int8_t_defined #define __int8_t_defined
#ifndef int8_t
typedef $acx_cv_type_int8_t int8_t; typedef $acx_cv_type_int8_t int8_t;
#endif #endif
#endif #endif
#endif
#ifndef _INT16_T #ifndef _INT16_T
#define _INT16_T #define _INT16_T
#ifndef __int16_t_defined #ifndef __int16_t_defined
#define __int16_t_defined #define __int16_t_defined
#ifndef int16_t
typedef $acx_cv_type_int16_t int16_t; typedef $acx_cv_type_int16_t int16_t;
#endif #endif
#endif #endif
#endif
#ifndef _INT32_T #ifndef _INT32_T
#define _INT32_T #define _INT32_T
#ifndef __int32_t_defined #ifndef __int32_t_defined
#define __int32_t_defined #define __int32_t_defined
#ifndef int32_t
typedef $acx_cv_type_int32_t int32_t; typedef $acx_cv_type_int32_t int32_t;
#endif #endif
#endif #endif
#endif
EOF EOF
elif test "$ac_cv_type_u_int32_t" = yes; then elif test "$ac_cv_type_u_int32_t" = yes; then
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
...@@ -18908,25 +18920,31 @@ elif test "$ac_cv_type_u_int32_t" = yes; then ...@@ -18908,25 +18920,31 @@ elif test "$ac_cv_type_u_int32_t" = yes; then
#define _UINT8_T #define _UINT8_T
#ifndef __uint8_t_defined #ifndef __uint8_t_defined
#define __uint8_t_defined #define __uint8_t_defined
#ifndef uint8_t
typedef u_int8_t uint8_t; typedef u_int8_t uint8_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT16_T #ifndef _UINT16_T
#define _UINT16_T #define _UINT16_T
#ifndef __uint16_t_defined #ifndef __uint16_t_defined
#define __uint16_t_defined #define __uint16_t_defined
#ifndef uint16_t
typedef u_int16_t uint16_t; typedef u_int16_t uint16_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT32_T #ifndef _UINT32_T
#define _UINT32_T #define _UINT32_T
#ifndef __uint32_t_defined #ifndef __uint32_t_defined
#define __uint32_t_defined #define __uint32_t_defined
#ifndef uint32_t
typedef u_int32_t uint32_t; typedef u_int32_t uint32_t;
#endif #endif
#endif #endif
#endif
EOF EOF
else else
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
...@@ -18976,9 +18994,11 @@ elif test "$ac_cv_type_u_int64_t" = yes; then ...@@ -18976,9 +18994,11 @@ elif test "$ac_cv_type_u_int64_t" = yes; then
#define _UINT64_T #define _UINT64_T
#ifndef __uint64_t_defined #ifndef __uint64_t_defined
#define __uint64_t_defined #define __uint64_t_defined
#ifndef uint64_t
typedef u_int64_t uint64_t; typedef u_int64_t uint64_t;
#endif #endif
#endif #endif
#endif
EOF EOF
elif test -n "$acx_cv_type_int64_t"; then elif test -n "$acx_cv_type_int64_t"; then
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
...@@ -18986,15 +19006,19 @@ elif test -n "$acx_cv_type_int64_t"; then ...@@ -18986,15 +19006,19 @@ elif test -n "$acx_cv_type_int64_t"; then
/* architecture has a 64-bit type, $acx_cv_type_int64_t */ /* architecture has a 64-bit type, $acx_cv_type_int64_t */
#ifndef _INT64_T #ifndef _INT64_T
#define _INT64_T #define _INT64_T
#ifndef int64_t
typedef $acx_cv_type_int64_t int64_t; typedef $acx_cv_type_int64_t int64_t;
#endif #endif
#endif
#ifndef _UINT64_T #ifndef _UINT64_T
#define _UINT64_T #define _UINT64_T
#ifndef __uint64_t_defined #ifndef __uint64_t_defined
#define __uint64_t_defined #define __uint64_t_defined
#ifndef uint64_t
typedef unsigned $acx_cv_type_int64_t uint64_t; typedef unsigned $acx_cv_type_int64_t uint64_t;
#endif #endif
#endif #endif
#endif
EOF EOF
else else
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
...@@ -19004,13 +19028,17 @@ else ...@@ -19004,13 +19028,17 @@ else
#ifndef _INT64_T #ifndef _INT64_T
#define _INT64_T #define _INT64_T
#ifndef __int64_t_defined #ifndef __int64_t_defined
#ifndef int64_t
typedef long long int64_t; typedef long long int64_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT64_T #ifndef _UINT64_T
#define _UINT64_T #define _UINT64_T
#ifndef uint64_t
typedef unsigned long long uint64_t; typedef unsigned long long uint64_t;
#endif #endif
#endif
#elif defined __GNUC__ && defined (__STDC__) && __STDC__-0 #elif defined __GNUC__ && defined (__STDC__) && __STDC__-0
/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
...@@ -19022,24 +19050,32 @@ else ...@@ -19022,24 +19050,32 @@ else
# ifndef _INT64_T # ifndef _INT64_T
# define _INT64_T # define _INT64_T
# ifndef int64_t
__extension__ typedef long long int64_t; __extension__ typedef long long int64_t;
# endif # endif
# endif
# ifndef _UINT64_T # ifndef _UINT64_T
# define _UINT64_T # define _UINT64_T
# ifndef uint64_t
__extension__ typedef unsigned long long uint64_t; __extension__ typedef unsigned long long uint64_t;
# endif # endif
# endif
#elif !defined __STRICT_ANSI__ #elif !defined __STRICT_ANSI__
# if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__ # if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__
# ifndef _INT64_T # ifndef _INT64_T
# define _INT64_T # define _INT64_T
# ifndef int64_t
typedef __int64 int64_t; typedef __int64 int64_t;
# endif # endif
# endif
# ifndef _UINT64_T # ifndef _UINT64_T
# define _UINT64_T # define _UINT64_T
# ifndef uint64_t
typedef unsigned __int64 uint64_t; typedef unsigned __int64 uint64_t;
# endif # endif
# endif
# endif /* compiler */ # endif /* compiler */
#endif /* ANSI version */ #endif /* ANSI version */
...@@ -19052,11 +19088,15 @@ if test "$ac_cv_type_uintptr_t" != yes; then ...@@ -19052,11 +19088,15 @@ if test "$ac_cv_type_uintptr_t" != yes; then
/* Define intptr_t based on sizeof(void*) = $ac_cv_sizeof_void_p */ /* Define intptr_t based on sizeof(void*) = $ac_cv_sizeof_void_p */
#ifndef __uintptr_t_defined #ifndef __uintptr_t_defined
#ifndef uintptr_t
typedef u$acx_cv_type_intptr_t uintptr_t; typedef u$acx_cv_type_intptr_t uintptr_t;
#endif #endif
#endif
#ifndef __intptr_t_defined #ifndef __intptr_t_defined
#ifndef intptr_t
typedef $acx_cv_type_intptr_t intptr_t; typedef $acx_cv_type_intptr_t intptr_t;
#endif #endif
#endif
EOF EOF
fi fi
...@@ -19106,16 +19146,20 @@ if test "$ac_cv_type_uintmax_t" != yes; then ...@@ -19106,16 +19146,20 @@ if test "$ac_cv_type_uintmax_t" != yes; then
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
/* Define intmax based on what we found */ /* Define intmax based on what we found */
#ifndef intmax_t
#ifdef _INT64_T #ifdef _INT64_T
typedef int64_t intmax_t; typedef int64_t intmax_t;
#else #else
typedef long intmax_t; typedef long intmax_t;
#endif #endif
#endif
#ifndef uintmax_t
#ifdef _UINT64_T #ifdef _UINT64_T
typedef uint64_t uintmax_t; typedef uint64_t uintmax_t;
#else #else
typedef unsigned long uintmax_t; typedef unsigned long uintmax_t;
#endif #endif
#endif
EOF EOF
fi fi
......
libstdc++-v3/ChangeLog
2010-01-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* configure: Regenerate.
2010-01-05 Paolo Carlini <paolo.carlini@oracle.com> 2010-01-05 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/22_locale/time_get/get_monthname/char/6.cc: New. * testsuite/22_locale/time_get/get_monthname/char/6.cc: New.
......
libstdc++-v3/configure
...@@ -61794,49 +61794,61 @@ if test "$acx_cv_header_stdint" = stddef.h; then ...@@ -61794,49 +61794,61 @@ if test "$acx_cv_header_stdint" = stddef.h; then
#define _UINT8_T #define _UINT8_T
#ifndef __uint8_t_defined #ifndef __uint8_t_defined
#define __uint8_t_defined #define __uint8_t_defined
#ifndef uint8_t
typedef unsigned $acx_cv_type_int8_t uint8_t; typedef unsigned $acx_cv_type_int8_t uint8_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT16_T #ifndef _UINT16_T
#define _UINT16_T #define _UINT16_T
#ifndef __uint16_t_defined #ifndef __uint16_t_defined
#define __uint16_t_defined #define __uint16_t_defined
#ifndef uint16_t
typedef unsigned $acx_cv_type_int16_t uint16_t; typedef unsigned $acx_cv_type_int16_t uint16_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT32_T #ifndef _UINT32_T
#define _UINT32_T #define _UINT32_T
#ifndef __uint32_t_defined #ifndef __uint32_t_defined
#define __uint32_t_defined #define __uint32_t_defined
#ifndef uint32_t
typedef unsigned $acx_cv_type_int32_t uint32_t; typedef unsigned $acx_cv_type_int32_t uint32_t;
#endif #endif
#endif #endif
#endif
#ifndef _INT8_T #ifndef _INT8_T
#define _INT8_T #define _INT8_T
#ifndef __int8_t_defined #ifndef __int8_t_defined
#define __int8_t_defined #define __int8_t_defined
#ifndef int8_t
typedef $acx_cv_type_int8_t int8_t; typedef $acx_cv_type_int8_t int8_t;
#endif #endif
#endif #endif
#endif
#ifndef _INT16_T #ifndef _INT16_T
#define _INT16_T #define _INT16_T
#ifndef __int16_t_defined #ifndef __int16_t_defined
#define __int16_t_defined #define __int16_t_defined
#ifndef int16_t
typedef $acx_cv_type_int16_t int16_t; typedef $acx_cv_type_int16_t int16_t;
#endif #endif
#endif #endif
#endif
#ifndef _INT32_T #ifndef _INT32_T
#define _INT32_T #define _INT32_T
#ifndef __int32_t_defined #ifndef __int32_t_defined
#define __int32_t_defined #define __int32_t_defined
#ifndef int32_t
typedef $acx_cv_type_int32_t int32_t; typedef $acx_cv_type_int32_t int32_t;
#endif #endif
#endif #endif
#endif
EOF EOF
elif test "$ac_cv_type_u_int32_t" = yes; then elif test "$ac_cv_type_u_int32_t" = yes; then
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
...@@ -61856,25 +61868,31 @@ elif test "$ac_cv_type_u_int32_t" = yes; then ...@@ -61856,25 +61868,31 @@ elif test "$ac_cv_type_u_int32_t" = yes; then
#define _UINT8_T #define _UINT8_T
#ifndef __uint8_t_defined #ifndef __uint8_t_defined
#define __uint8_t_defined #define __uint8_t_defined
#ifndef uint8_t
typedef u_int8_t uint8_t; typedef u_int8_t uint8_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT16_T #ifndef _UINT16_T
#define _UINT16_T #define _UINT16_T
#ifndef __uint16_t_defined #ifndef __uint16_t_defined
#define __uint16_t_defined #define __uint16_t_defined
#ifndef uint16_t
typedef u_int16_t uint16_t; typedef u_int16_t uint16_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT32_T #ifndef _UINT32_T
#define _UINT32_T #define _UINT32_T
#ifndef __uint32_t_defined #ifndef __uint32_t_defined
#define __uint32_t_defined #define __uint32_t_defined
#ifndef uint32_t
typedef u_int32_t uint32_t; typedef u_int32_t uint32_t;
#endif #endif
#endif #endif
#endif
EOF EOF
else else
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
...@@ -61924,9 +61942,11 @@ elif test "$ac_cv_type_u_int64_t" = yes; then ...@@ -61924,9 +61942,11 @@ elif test "$ac_cv_type_u_int64_t" = yes; then
#define _UINT64_T #define _UINT64_T
#ifndef __uint64_t_defined #ifndef __uint64_t_defined
#define __uint64_t_defined #define __uint64_t_defined
#ifndef uint64_t
typedef u_int64_t uint64_t; typedef u_int64_t uint64_t;
#endif #endif
#endif #endif
#endif
EOF EOF
elif test -n "$acx_cv_type_int64_t"; then elif test -n "$acx_cv_type_int64_t"; then
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
...@@ -61934,15 +61954,19 @@ elif test -n "$acx_cv_type_int64_t"; then ...@@ -61934,15 +61954,19 @@ elif test -n "$acx_cv_type_int64_t"; then
/* architecture has a 64-bit type, $acx_cv_type_int64_t */ /* architecture has a 64-bit type, $acx_cv_type_int64_t */
#ifndef _INT64_T #ifndef _INT64_T
#define _INT64_T #define _INT64_T
#ifndef int64_t
typedef $acx_cv_type_int64_t int64_t; typedef $acx_cv_type_int64_t int64_t;
#endif #endif
#endif
#ifndef _UINT64_T #ifndef _UINT64_T
#define _UINT64_T #define _UINT64_T
#ifndef __uint64_t_defined #ifndef __uint64_t_defined
#define __uint64_t_defined #define __uint64_t_defined
#ifndef uint64_t
typedef unsigned $acx_cv_type_int64_t uint64_t; typedef unsigned $acx_cv_type_int64_t uint64_t;
#endif #endif
#endif #endif
#endif
EOF EOF
else else
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
...@@ -61952,13 +61976,17 @@ else ...@@ -61952,13 +61976,17 @@ else
#ifndef _INT64_T #ifndef _INT64_T
#define _INT64_T #define _INT64_T
#ifndef __int64_t_defined #ifndef __int64_t_defined
#ifndef int64_t
typedef long long int64_t; typedef long long int64_t;
#endif #endif
#endif #endif
#endif
#ifndef _UINT64_T #ifndef _UINT64_T
#define _UINT64_T #define _UINT64_T
#ifndef uint64_t
typedef unsigned long long uint64_t; typedef unsigned long long uint64_t;
#endif #endif
#endif
#elif defined __GNUC__ && defined (__STDC__) && __STDC__-0 #elif defined __GNUC__ && defined (__STDC__) && __STDC__-0
/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
...@@ -61970,24 +61998,32 @@ else ...@@ -61970,24 +61998,32 @@ else
# ifndef _INT64_T # ifndef _INT64_T
# define _INT64_T # define _INT64_T
# ifndef int64_t
__extension__ typedef long long int64_t; __extension__ typedef long long int64_t;
# endif # endif
# endif
# ifndef _UINT64_T # ifndef _UINT64_T
# define _UINT64_T # define _UINT64_T
# ifndef uint64_t
__extension__ typedef unsigned long long uint64_t; __extension__ typedef unsigned long long uint64_t;
# endif # endif
# endif
#elif !defined __STRICT_ANSI__ #elif !defined __STRICT_ANSI__
# if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__ # if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__
# ifndef _INT64_T # ifndef _INT64_T
# define _INT64_T # define _INT64_T
# ifndef int64_t
typedef __int64 int64_t; typedef __int64 int64_t;
# endif # endif
# endif
# ifndef _UINT64_T # ifndef _UINT64_T
# define _UINT64_T # define _UINT64_T
# ifndef uint64_t
typedef unsigned __int64 uint64_t; typedef unsigned __int64 uint64_t;
# endif # endif
# endif
# endif /* compiler */ # endif /* compiler */
#endif /* ANSI version */ #endif /* ANSI version */
...@@ -62000,11 +62036,15 @@ if test "$ac_cv_type_uintptr_t" != yes; then ...@@ -62000,11 +62036,15 @@ if test "$ac_cv_type_uintptr_t" != yes; then
/* Define intptr_t based on sizeof(void*) = $ac_cv_sizeof_void_p */ /* Define intptr_t based on sizeof(void*) = $ac_cv_sizeof_void_p */
#ifndef __uintptr_t_defined #ifndef __uintptr_t_defined
#ifndef uintptr_t
typedef u$acx_cv_type_intptr_t uintptr_t; typedef u$acx_cv_type_intptr_t uintptr_t;
#endif #endif
#endif
#ifndef __intptr_t_defined #ifndef __intptr_t_defined
#ifndef intptr_t
typedef $acx_cv_type_intptr_t intptr_t; typedef $acx_cv_type_intptr_t intptr_t;
#endif #endif
#endif
EOF EOF
fi fi
...@@ -62054,16 +62094,20 @@ if test "$ac_cv_type_uintmax_t" != yes; then ...@@ -62054,16 +62094,20 @@ if test "$ac_cv_type_uintmax_t" != yes; then
sed 's/^ *//' >> tmp-stdint.h <<EOF sed 's/^ *//' >> tmp-stdint.h <<EOF
/* Define intmax based on what we found */ /* Define intmax based on what we found */
#ifndef intmax_t
#ifdef _INT64_T #ifdef _INT64_T
typedef int64_t intmax_t; typedef int64_t intmax_t;
#else #else
typedef long intmax_t; typedef long intmax_t;
#endif #endif
#endif
#ifndef uintmax_t
#ifdef _UINT64_T #ifdef _UINT64_T
typedef uint64_t uintmax_t; typedef uint64_t uintmax_t;
#else #else
typedef unsigned long uintmax_t; typedef unsigned long uintmax_t;
#endif #endif
#endif
EOF EOF
fi fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment