summaryrefslogtreecommitdiff
path: root/libdecnumber
diff options
context:
space:
mode:
authorro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>2010-01-05 14:02:37 +0000
committerro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>2010-01-05 14:02:37 +0000
commit9ad2e3f3b227187ee891e9a0bd1161c8560fc3e2 (patch)
treeeaefc673a50905bb9e7786e5d87fbffeb8e9d17c /libdecnumber
parenta97efcbd10b1578882ebba981cfef61612c3a068 (diff)
downloadgcc-9ad2e3f3b227187ee891e9a0bd1161c8560fc3e2.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@155648 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libdecnumber')
-rw-r--r--libdecnumber/ChangeLog4
-rwxr-xr-xlibdecnumber/configure44
2 files changed, 48 insertions, 0 deletions
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