aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/ChangeLog5
-rw-r--r--config/stdint.m444
-rw-r--r--libdecnumber/ChangeLog4
-rwxr-xr-xlibdecnumber/configure44
-rw-r--r--libgfortran/ChangeLog4
-rwxr-xr-xlibgfortran/configure44
-rw-r--r--libgomp/ChangeLog4
-rwxr-xr-xlibgomp/configure44
-rw-r--r--libstdc++-v3/ChangeLog4
-rwxr-xr-xlibstdc++-v3/configure44
10 files changed, 241 insertions, 0 deletions
diff --git a/config/ChangeLog b/config/ChangeLog
index a881349ba84..b6f0c2dc324 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+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>
PR lto/41529
diff --git a/config/stdint.m4 b/config/stdint.m4
index b26b4fc266d..d63081d07e2 100644
--- a/config/stdint.m4
+++ b/config/stdint.m4
@@ -234,49 +234,61 @@ if test "$acx_cv_header_stdint" = stddef.h; then
#define _UINT8_T
#ifndef __uint8_t_defined
#define __uint8_t_defined
+ #ifndef uint8_t
typedef unsigned $acx_cv_type_int8_t uint8_t;
#endif
#endif
+ #endif
#ifndef _UINT16_T
#define _UINT16_T
#ifndef __uint16_t_defined
#define __uint16_t_defined
+ #ifndef uint16_t
typedef unsigned $acx_cv_type_int16_t uint16_t;
#endif
#endif
+ #endif
#ifndef _UINT32_T
#define _UINT32_T
#ifndef __uint32_t_defined
#define __uint32_t_defined
+ #ifndef uint32_t
typedef unsigned $acx_cv_type_int32_t uint32_t;
#endif
#endif
+ #endif
#ifndef _INT8_T
#define _INT8_T
#ifndef __int8_t_defined
#define __int8_t_defined
+ #ifndef int8_t
typedef $acx_cv_type_int8_t int8_t;
#endif
#endif
+ #endif
#ifndef _INT16_T
#define _INT16_T
#ifndef __int16_t_defined
#define __int16_t_defined
+ #ifndef int16_t
typedef $acx_cv_type_int16_t int16_t;
#endif
#endif
+ #endif
#ifndef _INT32_T
#define _INT32_T
#ifndef __int32_t_defined
#define __int32_t_defined
+ #ifndef int32_t
typedef $acx_cv_type_int32_t int32_t;
#endif
#endif
+ #endif
EOF
elif test "$ac_cv_type_u_int32_t" = yes; then
sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -296,25 +308,31 @@ elif test "$ac_cv_type_u_int32_t" = yes; then
#define _UINT8_T
#ifndef __uint8_t_defined
#define __uint8_t_defined
+ #ifndef uint8_t
typedef u_int8_t uint8_t;
#endif
#endif
+ #endif
#ifndef _UINT16_T
#define _UINT16_T
#ifndef __uint16_t_defined
#define __uint16_t_defined
+ #ifndef uint16_t
typedef u_int16_t uint16_t;
#endif
#endif
+ #endif
#ifndef _UINT32_T
#define _UINT32_T
#ifndef __uint32_t_defined
#define __uint32_t_defined
+ #ifndef uint32_t
typedef u_int32_t uint32_t;
#endif
#endif
+ #endif
EOF
else
sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -364,9 +382,11 @@ elif test "$ac_cv_type_u_int64_t" = yes; then
#define _UINT64_T
#ifndef __uint64_t_defined
#define __uint64_t_defined
+ #ifndef uint64_t
typedef u_int64_t uint64_t;
#endif
#endif
+ #endif
EOF
elif test -n "$acx_cv_type_int64_t"; then
sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -374,15 +394,19 @@ elif test -n "$acx_cv_type_int64_t"; then
/* architecture has a 64-bit type, $acx_cv_type_int64_t */
#ifndef _INT64_T
#define _INT64_T
+ #ifndef int64_t
typedef $acx_cv_type_int64_t int64_t;
#endif
+ #endif
#ifndef _UINT64_T
#define _UINT64_T
#ifndef __uint64_t_defined
#define __uint64_t_defined
+ #ifndef uint64_t
typedef unsigned $acx_cv_type_int64_t uint64_t;
#endif
#endif
+ #endif
EOF
else
sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -392,13 +416,17 @@ else
#ifndef _INT64_T
#define _INT64_T
#ifndef __int64_t_defined
+ #ifndef int64_t
typedef long long int64_t;
#endif
#endif
+ #endif
#ifndef _UINT64_T
#define _UINT64_T
+ #ifndef uint64_t
typedef unsigned long long uint64_t;
#endif
+ #endif
#elif defined __GNUC__ && defined (__STDC__) && __STDC__-0
/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
@@ -410,24 +438,32 @@ else
# ifndef _INT64_T
# define _INT64_T
+ # ifndef int64_t
__extension__ typedef long long int64_t;
# endif
+ # endif
# ifndef _UINT64_T
# define _UINT64_T
+ # ifndef uint64_t
__extension__ typedef unsigned long long uint64_t;
# endif
+ # endif
#elif !defined __STRICT_ANSI__
# if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__
# ifndef _INT64_T
# define _INT64_T
+ # ifndef int64_t
typedef __int64 int64_t;
# endif
+ # endif
# ifndef _UINT64_T
# define _UINT64_T
+ # ifndef uint64_t
typedef unsigned __int64 uint64_t;
# endif
+ # endif
# endif /* compiler */
#endif /* ANSI version */
@@ -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 */
#ifndef __uintptr_t_defined
+ #ifndef uintptr_t
typedef u$acx_cv_type_intptr_t uintptr_t;
#endif
+ #endif
#ifndef __intptr_t_defined
+ #ifndef intptr_t
typedef $acx_cv_type_intptr_t intptr_t;
#endif
+ #endif
EOF
fi
@@ -496,16 +536,20 @@ if test "$ac_cv_type_uintmax_t" != yes; then
sed 's/^ *//' >> tmp-stdint.h <<EOF
/* Define intmax based on what we found */
+ #ifndef intmax_t
#ifdef _INT64_T
typedef int64_t intmax_t;
#else
typedef long intmax_t;
#endif
+ #endif
+ #ifndef uintmax_t
#ifdef _UINT64_T
typedef uint64_t uintmax_t;
#else
typedef unsigned long uintmax_t;
#endif
+ #endif
EOF
fi
diff --git a/libdecnumber/ChangeLog b/libdecnumber/ChangeLog
index 88df3a4d84b..b218e422918 100644
--- a/libdecnumber/ChangeLog
+++ b/libdecnumber/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ * configure: Regenerate.
+
2009-11-28 Jakub Jelinek <jakub@redhat.com>
* decContext.c (decContextTestEndian): Move adj definition into
diff --git a/libdecnumber/configure b/libdecnumber/configure
index 75a7b90570f..f621fc7ccae 100755
--- a/libdecnumber/configure
+++ b/libdecnumber/configure
@@ -6162,49 +6162,61 @@ if test "$acx_cv_header_stdint" = stddef.h; then
#define _UINT8_T
#ifndef __uint8_t_defined
#define __uint8_t_defined
+ #ifndef uint8_t
typedef unsigned $acx_cv_type_int8_t uint8_t;
#endif
#endif
+ #endif
#ifndef _UINT16_T
#define _UINT16_T
#ifndef __uint16_t_defined
#define __uint16_t_defined
+ #ifndef uint16_t
typedef unsigned $acx_cv_type_int16_t uint16_t;
#endif
#endif
+ #endif
#ifndef _UINT32_T
#define _UINT32_T
#ifndef __uint32_t_defined
#define __uint32_t_defined
+ #ifndef uint32_t
typedef unsigned $acx_cv_type_int32_t uint32_t;
#endif
#endif
+ #endif
#ifndef _INT8_T
#define _INT8_T
#ifndef __int8_t_defined
#define __int8_t_defined
+ #ifndef int8_t
typedef $acx_cv_type_int8_t int8_t;
#endif
#endif
+ #endif
#ifndef _INT16_T
#define _INT16_T
#ifndef __int16_t_defined
#define __int16_t_defined
+ #ifndef int16_t
typedef $acx_cv_type_int16_t int16_t;
#endif
#endif
+ #endif
#ifndef _INT32_T
#define _INT32_T
#ifndef __int32_t_defined
#define __int32_t_defined
+ #ifndef int32_t
typedef $acx_cv_type_int32_t int32_t;
#endif
#endif
+ #endif
EOF
elif test "$ac_cv_type_u_int32_t" = yes; then
sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -6224,25 +6236,31 @@ elif test "$ac_cv_type_u_int32_t" = yes; then
#define _UINT8_T
#ifndef __uint8_t_defined
#define __uint8_t_defined
+ #ifndef uint8_t
typedef u_int8_t uint8_t;
#endif
#endif
+ #endif
#ifndef _UINT16_T
#define _UINT16_T
#ifndef __uint16_t_defined
#define __uint16_t_defined
+ #ifndef uint16_t
typedef u_int16_t uint16_t;
#endif
#endif
+ #endif
#ifndef _UINT32_T
#define _UINT32_T
#ifndef __uint32_t_defined
#define __uint32_t_defined
+ #ifndef uint32_t
typedef u_int32_t uint32_t;
#endif
#endif
+ #endif
EOF
else
sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -6292,9 +6310,11 @@ elif test "$ac_cv_type_u_int64_t" = yes; then
#define _UINT64_T
#ifndef __uint64_t_defined
#define __uint64_t_defined
+ #ifndef uint64_t
typedef u_int64_t uint64_t;
#endif
#endif
+ #endif
EOF
elif test -n "$acx_cv_type_int64_t"; then
sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -6302,15 +6322,19 @@ elif test -n "$acx_cv_type_int64_t"; then
/* architecture has a 64-bit type, $acx_cv_type_int64_t */
#ifndef _INT64_T
#define _INT64_T
+ #ifndef int64_t
typedef $acx_cv_type_int64_t int64_t;
#endif
+ #endif
#ifndef _UINT64_T
#define _UINT64_T
#ifndef __uint64_t_defined
#define __uint64_t_defined
+ #ifndef uint64_t
typedef unsigned $acx_cv_type_int64_t uint64_t;
#endif
#endif
+ #endif
EOF
else
sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -6320,13 +6344,17 @@ else
#ifndef _INT64_T
#define _INT64_T
#ifndef __int64_t_defined
+ #ifndef int64_t
typedef long long int64_t;
#endif
#endif
+ #endif
#ifndef _UINT64_T
#define _UINT64_T
+ #ifndef uint64_t
typedef unsigned long long uint64_t;
#endif
+ #endif
#elif defined __GNUC__ && defined (__STDC__) && __STDC__-0
/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
@@ -6338,24 +6366,32 @@ else
# ifndef _INT64_T
# define _INT64_T
+ # ifndef int64_t
__extension__ typedef long long int64_t;
# endif
+ # endif
# ifndef _UINT64_T
# define _UINT64_T
+ # ifndef uint64_t
__extension__ typedef unsigned long long uint64_t;
# endif
+ # endif
#elif !defined __STRICT_ANSI__
# if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__
# ifndef _INT64_T
# define _INT64_T
+ # ifndef int64_t
typedef __int64 int64_t;
# endif
+ # endif
# ifndef _UINT64_T
# define _UINT64_T
+ # ifndef uint64_t
typedef unsigned __int64 uint64_t;
# endif
+ # endif
# endif /* compiler */
#endif /* ANSI version */
@@ -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 */
#ifndef __uintptr_t_defined
+ #ifndef uintptr_t
typedef u$acx_cv_type_intptr_t uintptr_t;
#endif
+ #endif
#ifndef __intptr_t_defined
+ #ifndef intptr_t
typedef $acx_cv_type_intptr_t intptr_t;
#endif
+ #endif
EOF
fi
@@ -6422,16 +6462,20 @@ if test "$ac_cv_type_uintmax_t" != yes; then
sed 's/^ *//' >> tmp-stdint.h <<EOF
/* Define intmax based on what we found */
+ #ifndef intmax_t
#ifdef _INT64_T
typedef int64_t intmax_t;
#else
typedef long intmax_t;
#endif
+ #endif
+ #ifndef uintmax_t
#ifdef _UINT64_T
typedef uint64_t uintmax_t;
#else
typedef unsigned long uintmax_t;
#endif
+ #endif
EOF
fi
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 690b4805519..fbd9dd43309 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ * configure: Regenerate.
+
2010-01-03 Janne Blomqvist <jb@gcc.gnu.org>
PR libfortran/42420
diff --git a/libgfortran/configure b/libgfortran/configure
index b43a08b0910..46e08630fc6 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -27623,49 +27623,61 @@ if test "$acx_cv_header_stdint" = stddef.h; then
#define _UINT8_T
#ifndef __uint8_t_defined
#define __uint8_t_defined
+ #ifndef uint8_t
typedef unsigned $acx_cv_type_int8_t uint8_t;
#endif
#endif
+ #endif
#ifndef _UINT16_T
#define _UINT16_T
#ifndef __uint16_t_defined
#define __uint16_t_defined
+ #ifndef uint16_t
typedef unsigned $acx_cv_type_int16_t uint16_t;
#endif
#endif
+ #endif
#ifndef _UINT32_T
#define _UINT32_T
#ifndef __uint32_t_defined
#define __uint32_t_defined
+ #ifndef uint32_t
typedef unsigned $acx_cv_type_int32_t uint32_t;
#endif
#endif
+ #endif
#ifndef _INT8_T
#define _INT8_T
#ifndef __int8_t_defined
#define __int8_t_defined
+ #ifndef int8_t
typedef $acx_cv_type_int8_t int8_t;
#endif
#endif
+ #endif
#ifndef _INT16_T
#define _INT16_T
#ifndef __int16_t_defined
#define __int16_t_defined
+ #ifndef int16_t
typedef $acx_cv_type_int16_t int16_t;
#endif
#endif
+ #endif
#ifndef _INT32_T
#define _INT32_T
#ifndef __int32_t_defined
#define __int32_t_defined
+ #ifndef int32_t
typedef $acx_cv_type_int32_t int32_t;
#endif
#endif
+ #endif
EOF
elif test "$ac_cv_type_u_int32_t" = yes; then
sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -27685,25 +27697,31 @@ elif test "$ac_cv_type_u_int32_t" = yes; then
#define _UINT8_T
#ifndef __uint8_t_defined
#define __uint8_t_defined
+ #ifndef uint8_t
typedef u_int8_t uint8_t;
#endif
#endif
+ #endif
#ifndef _UINT16_T
#define _UINT16_T
#ifndef __uint16_t_defined
#define __uint16_t_defined
+ #ifndef uint16_t
typedef u_int16_t uint16_t;
#endif
#endif
+ #endif
#ifndef _UINT32_T
#define _UINT32_T
#ifndef __uint32_t_defined
#define __uint32_t_defined
+ #ifndef uint32_t
typedef u_int32_t uint32_t;
#endif
#endif
+ #endif
EOF
else
sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -27753,9 +27771,11 @@ elif test "$ac_cv_type_u_int64_t" = yes; then
#define _UINT64_T
#ifndef __uint64_t_defined
#define __uint64_t_defined
+ #ifndef uint64_t
typedef u_int64_t uint64_t;
#endif
#endif
+ #endif
EOF
elif test -n "$acx_cv_type_int64_t"; then
sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -27763,15 +27783,19 @@ elif test -n "$acx_cv_type_int64_t"; then
/* architecture has a 64-bit type, $acx_cv_type_int64_t */
#ifndef _INT64_T
#define _INT64_T
+ #ifndef int64_t
typedef $acx_cv_type_int64_t int64_t;
#endif
+ #endif
#ifndef _UINT64_T
#define _UINT64_T
#ifndef __uint64_t_defined
#define __uint64_t_defined
+ #ifndef uint64_t
typedef unsigned $acx_cv_type_int64_t uint64_t;
#endif
#endif
+ #endif
EOF
else
sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -27781,13 +27805,17 @@ else
#ifndef _INT64_T
#define _INT64_T
#ifndef __int64_t_defined
+ #ifndef int64_t
typedef long long int64_t;
#endif
#endif
+ #endif
#ifndef _UINT64_T
#define _UINT64_T
+ #ifndef uint64_t
typedef unsigned long long uint64_t;
#endif
+ #endif
#elif defined __GNUC__ && defined (__STDC__) && __STDC__-0
/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
@@ -27799,24 +27827,32 @@ else
# ifndef _INT64_T
# define _INT64_T
+ # ifndef int64_t
__extension__ typedef long long int64_t;
# endif
+ # endif
# ifndef _UINT64_T
# define _UINT64_T
+ # ifndef uint64_t
__extension__ typedef unsigned long long uint64_t;
# endif
+ # endif
#elif !defined __STRICT_ANSI__
# if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__
# ifndef _INT64_T
# define _INT64_T
+ # ifndef int64_t
typedef __int64 int64_t;
# endif
+ # endif
# ifndef _UINT64_T
# define _UINT64_T
+ # ifndef uint64_t
typedef unsigned __int64 uint64_t;
# endif
+ # endif
# endif /* compiler */
#endif /* ANSI version */
@@ -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 */
#ifndef __uintptr_t_defined
+ #ifndef uintptr_t
typedef u$acx_cv_type_intptr_t uintptr_t;
#endif
+ #endif
#ifndef __intptr_t_defined
+ #ifndef intptr_t
typedef $acx_cv_type_intptr_t intptr_t;
#endif
+ #endif
EOF
fi
@@ -27883,16 +27923,20 @@ if test "$ac_cv_type_uintmax_t" != yes; then
sed 's/^ *//' >> tmp-stdint.h <<EOF
/* Define intmax based on what we found */
+ #ifndef intmax_t
#ifdef _INT64_T
typedef int64_t intmax_t;
#else
typedef long intmax_t;
#endif
+ #endif
+ #ifndef uintmax_t
#ifdef _UINT64_T
typedef uint64_t uintmax_t;
#else
typedef unsigned long uintmax_t;
#endif
+ #endif
EOF
fi
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 2a5d3aeee76..4bd7efa6ecd 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ * configure: Regenerate.
+
2010-01-04 H.J. Lu <hongjiu.lu@intel.com>
PR libgomp/42602
diff --git a/libgomp/configure b/libgomp/configure
index e4fe5fecc4c..02e2861fb5d 100755
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -18846,49 +18846,61 @@ if test "$acx_cv_header_stdint" = stddef.h; then
#define _UINT8_T
#ifndef __uint8_t_defined
#define __uint8_t_defined
+ #ifndef uint8_t
typedef unsigned $acx_cv_type_int8_t uint8_t;
#endif
#endif
+ #endif
#ifndef _UINT16_T
#define _UINT16_T
#ifndef __uint16_t_defined
#define __uint16_t_defined
+ #ifndef uint16_t
typedef unsigned $acx_cv_type_int16_t uint16_t;
#endif
#endif
+ #endif
#ifndef _UINT32_T
#define _UINT32_T
#ifndef __uint32_t_defined
#define __uint32_t_defined
+ #ifndef uint32_t
typedef unsigned $acx_cv_type_int32_t uint32_t;
#endif
#endif
+ #endif
#ifndef _INT8_T
#define _INT8_T
#ifndef __int8_t_defined
#define __int8_t_defined
+ #ifndef int8_t
typedef $acx_cv_type_int8_t int8_t;
#endif
#endif
+ #endif
#ifndef _INT16_T
#define _INT16_T
#ifndef __int16_t_defined
#define __int16_t_defined
+ #ifndef int16_t
typedef $acx_cv_type_int16_t int16_t;
#endif
#endif
+ #endif
#ifndef _INT32_T
#define _INT32_T
#ifndef __int32_t_defined
#define __int32_t_defined
+ #ifndef int32_t
typedef $acx_cv_type_int32_t int32_t;
#endif
#endif
+ #endif
EOF
elif test "$ac_cv_type_u_int32_t" = yes; then
sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -18908,25 +18920,31 @@ elif test "$ac_cv_type_u_int32_t" = yes; then
#define _UINT8_T
#ifndef __uint8_t_defined
#define __uint8_t_defined
+ #ifndef uint8_t
typedef u_int8_t uint8_t;
#endif
#endif
+ #endif
#ifndef _UINT16_T
#define _UINT16_T
#ifndef __uint16_t_defined
#define __uint16_t_defined
+ #ifndef uint16_t
typedef u_int16_t uint16_t;
#endif
#endif
+ #endif
#ifndef _UINT32_T
#define _UINT32_T
#ifndef __uint32_t_defined
#define __uint32_t_defined
+ #ifndef uint32_t
typedef u_int32_t uint32_t;
#endif
#endif
+ #endif
EOF
else
sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -18976,9 +18994,11 @@ elif test "$ac_cv_type_u_int64_t" = yes; then
#define _UINT64_T
#ifndef __uint64_t_defined
#define __uint64_t_defined
+ #ifndef uint64_t
typedef u_int64_t uint64_t;
#endif
#endif
+ #endif
EOF
elif test -n "$acx_cv_type_int64_t"; then
sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -18986,15 +19006,19 @@ elif test -n "$acx_cv_type_int64_t"; then
/* architecture has a 64-bit type, $acx_cv_type_int64_t */
#ifndef _INT64_T
#define _INT64_T
+ #ifndef int64_t
typedef $acx_cv_type_int64_t int64_t;
#endif
+ #endif
#ifndef _UINT64_T
#define _UINT64_T
#ifndef __uint64_t_defined
#define __uint64_t_defined
+ #ifndef uint64_t
typedef unsigned $acx_cv_type_int64_t uint64_t;
#endif
#endif
+ #endif
EOF
else
sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -19004,13 +19028,17 @@ else
#ifndef _INT64_T
#define _INT64_T
#ifndef __int64_t_defined
+ #ifndef int64_t
typedef long long int64_t;
#endif
#endif
+ #endif
#ifndef _UINT64_T
#define _UINT64_T
+ #ifndef uint64_t
typedef unsigned long long uint64_t;
#endif
+ #endif
#elif defined __GNUC__ && defined (__STDC__) && __STDC__-0
/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
@@ -19022,24 +19050,32 @@ else
# ifndef _INT64_T
# define _INT64_T
+ # ifndef int64_t
__extension__ typedef long long int64_t;
# endif
+ # endif
# ifndef _UINT64_T
# define _UINT64_T
+ # ifndef uint64_t
__extension__ typedef unsigned long long uint64_t;
# endif
+ # endif
#elif !defined __STRICT_ANSI__
# if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__
# ifndef _INT64_T
# define _INT64_T
+ # ifndef int64_t
typedef __int64 int64_t;
# endif
+ # endif
# ifndef _UINT64_T
# define _UINT64_T
+ # ifndef uint64_t
typedef unsigned __int64 uint64_t;
# endif
+ # endif
# endif /* compiler */
#endif /* ANSI version */
@@ -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 */
#ifndef __uintptr_t_defined
+ #ifndef uintptr_t
typedef u$acx_cv_type_intptr_t uintptr_t;
#endif
+ #endif
#ifndef __intptr_t_defined
+ #ifndef intptr_t
typedef $acx_cv_type_intptr_t intptr_t;
#endif
+ #endif
EOF
fi
@@ -19106,16 +19146,20 @@ if test "$ac_cv_type_uintmax_t" != yes; then
sed 's/^ *//' >> tmp-stdint.h <<EOF
/* Define intmax based on what we found */
+ #ifndef intmax_t
#ifdef _INT64_T
typedef int64_t intmax_t;
#else
typedef long intmax_t;
#endif
+ #endif
+ #ifndef uintmax_t
#ifdef _UINT64_T
typedef uint64_t uintmax_t;
#else
typedef unsigned long uintmax_t;
#endif
+ #endif
EOF
fi
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8f0cf4c6058..5b2e5d7a9e0 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-05 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ * configure: Regenerate.
+
2010-01-05 Paolo Carlini <paolo.carlini@oracle.com>
* testsuite/22_locale/time_get/get_monthname/char/6.cc: New.
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 6bd3c2273e5..82f7f59ddab 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -61794,49 +61794,61 @@ if test "$acx_cv_header_stdint" = stddef.h; then
#define _UINT8_T
#ifndef __uint8_t_defined
#define __uint8_t_defined
+ #ifndef uint8_t
typedef unsigned $acx_cv_type_int8_t uint8_t;
#endif
#endif
+ #endif
#ifndef _UINT16_T
#define _UINT16_T
#ifndef __uint16_t_defined
#define __uint16_t_defined
+ #ifndef uint16_t
typedef unsigned $acx_cv_type_int16_t uint16_t;
#endif
#endif
+ #endif
#ifndef _UINT32_T
#define _UINT32_T
#ifndef __uint32_t_defined
#define __uint32_t_defined
+ #ifndef uint32_t
typedef unsigned $acx_cv_type_int32_t uint32_t;
#endif
#endif
+ #endif
#ifndef _INT8_T
#define _INT8_T
#ifndef __int8_t_defined
#define __int8_t_defined
+ #ifndef int8_t
typedef $acx_cv_type_int8_t int8_t;
#endif
#endif
+ #endif
#ifndef _INT16_T
#define _INT16_T
#ifndef __int16_t_defined
#define __int16_t_defined
+ #ifndef int16_t
typedef $acx_cv_type_int16_t int16_t;
#endif
#endif
+ #endif
#ifndef _INT32_T
#define _INT32_T
#ifndef __int32_t_defined
#define __int32_t_defined
+ #ifndef int32_t
typedef $acx_cv_type_int32_t int32_t;
#endif
#endif
+ #endif
EOF
elif test "$ac_cv_type_u_int32_t" = yes; then
sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -61856,25 +61868,31 @@ elif test "$ac_cv_type_u_int32_t" = yes; then
#define _UINT8_T
#ifndef __uint8_t_defined
#define __uint8_t_defined
+ #ifndef uint8_t
typedef u_int8_t uint8_t;
#endif
#endif
+ #endif
#ifndef _UINT16_T
#define _UINT16_T
#ifndef __uint16_t_defined
#define __uint16_t_defined
+ #ifndef uint16_t
typedef u_int16_t uint16_t;
#endif
#endif
+ #endif
#ifndef _UINT32_T
#define _UINT32_T
#ifndef __uint32_t_defined
#define __uint32_t_defined
+ #ifndef uint32_t
typedef u_int32_t uint32_t;
#endif
#endif
+ #endif
EOF
else
sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -61924,9 +61942,11 @@ elif test "$ac_cv_type_u_int64_t" = yes; then
#define _UINT64_T
#ifndef __uint64_t_defined
#define __uint64_t_defined
+ #ifndef uint64_t
typedef u_int64_t uint64_t;
#endif
#endif
+ #endif
EOF
elif test -n "$acx_cv_type_int64_t"; then
sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -61934,15 +61954,19 @@ elif test -n "$acx_cv_type_int64_t"; then
/* architecture has a 64-bit type, $acx_cv_type_int64_t */
#ifndef _INT64_T
#define _INT64_T
+ #ifndef int64_t
typedef $acx_cv_type_int64_t int64_t;
#endif
+ #endif
#ifndef _UINT64_T
#define _UINT64_T
#ifndef __uint64_t_defined
#define __uint64_t_defined
+ #ifndef uint64_t
typedef unsigned $acx_cv_type_int64_t uint64_t;
#endif
#endif
+ #endif
EOF
else
sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -61952,13 +61976,17 @@ else
#ifndef _INT64_T
#define _INT64_T
#ifndef __int64_t_defined
+ #ifndef int64_t
typedef long long int64_t;
#endif
#endif
+ #endif
#ifndef _UINT64_T
#define _UINT64_T
+ #ifndef uint64_t
typedef unsigned long long uint64_t;
#endif
+ #endif
#elif defined __GNUC__ && defined (__STDC__) && __STDC__-0
/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
@@ -61970,24 +61998,32 @@ else
# ifndef _INT64_T
# define _INT64_T
+ # ifndef int64_t
__extension__ typedef long long int64_t;
# endif
+ # endif
# ifndef _UINT64_T
# define _UINT64_T
+ # ifndef uint64_t
__extension__ typedef unsigned long long uint64_t;
# endif
+ # endif
#elif !defined __STRICT_ANSI__
# if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__
# ifndef _INT64_T
# define _INT64_T
+ # ifndef int64_t
typedef __int64 int64_t;
# endif
+ # endif
# ifndef _UINT64_T
# define _UINT64_T
+ # ifndef uint64_t
typedef unsigned __int64 uint64_t;
# endif
+ # endif
# endif /* compiler */
#endif /* ANSI version */
@@ -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 */
#ifndef __uintptr_t_defined
+ #ifndef uintptr_t
typedef u$acx_cv_type_intptr_t uintptr_t;
#endif
+ #endif
#ifndef __intptr_t_defined
+ #ifndef intptr_t
typedef $acx_cv_type_intptr_t intptr_t;
#endif
+ #endif
EOF
fi
@@ -62054,16 +62094,20 @@ if test "$ac_cv_type_uintmax_t" != yes; then
sed 's/^ *//' >> tmp-stdint.h <<EOF
/* Define intmax based on what we found */
+ #ifndef intmax_t
#ifdef _INT64_T
typedef int64_t intmax_t;
#else
typedef long intmax_t;
#endif
+ #endif
+ #ifndef uintmax_t
#ifdef _UINT64_T
typedef uint64_t uintmax_t;
#else
typedef unsigned long uintmax_t;
#endif
+ #endif
EOF
fi
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-14 10:52:33 +0000