diff options
author | Paolo Bonzini <bonzini@gnu.org> | 2007-04-12 13:06:01 +0000 |
---|---|---|
committer | Paolo Bonzini <bonzini@gnu.org> | 2007-04-12 13:06:01 +0000 |
commit | 9e785243d19ff2b973a3ee50e7c15657e8a5ce46 (patch) | |
tree | 5764cefb8fb4a8c4e7cd9b8e61f6e9957ba5e467 | |
parent | 2c67c5f3e9a4545ff5b0bd3dbea5a3630b1f6a01 (diff) | |
download | gdb-9e785243d19ff2b973a3ee50e7c15657e8a5ce46.zip gdb-9e785243d19ff2b973a3ee50e7c15657e8a5ce46.tar.gz gdb-9e785243d19ff2b973a3ee50e7c15657e8a5ce46.tar.bz2 |
config:
2007-04-11 Kai Tietz <kai.tietz@onevision.com>
* stdint.m4: Make template compatible with older cygwin
types.h, wrapping each type in a __XXX_t_defined #ifdef.
-rw-r--r-- | config/ChangeLog | 5 | ||||
-rw-r--r-- | config/stdint.m4 | 39 |
2 files changed, 44 insertions, 0 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index 7b1384d..cd5185a 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2007-04-11 Kai Tietz <kai.tietz@onevision.com> + + * stdint.m4: Make template compatible with older cygwin + types.h, wrapping each type in a __XXX_t_defined #ifdef. + 2007-03-26 H.J. Lu <hongjiu.lu@intel.com> * acx.m4 (ACX_BUGURL): Set BUGURL first. Quote $BUGURL first diff --git a/config/stdint.m4 b/config/stdint.m4 index 0792382..025ffad 100644 --- a/config/stdint.m4 +++ b/config/stdint.m4 @@ -218,33 +218,51 @@ if test "$acx_cv_header_stdint" = stddef.h; then #ifndef _UINT8_T #define _UINT8_T + #ifndef __uint8_t_defined + #define __uint8_t_defined typedef unsigned $acx_cv_type_int8_t uint8_t; #endif + #endif #ifndef _UINT16_T #define _UINT16_T + #ifndef __uint16_t_defined + #define __uint16_t_defined typedef unsigned $acx_cv_type_int16_t uint16_t; #endif + #endif #ifndef _UINT32_T #define _UINT32_T + #ifndef __uint32_t_defined + #define __uint32_t_defined typedef unsigned $acx_cv_type_int32_t uint32_t; #endif + #endif #ifndef _INT8_T #define _INT8_T + #ifndef __int8_t_defined + #define __int8_t_defined typedef $acx_cv_type_int8_t int8_t; #endif + #endif #ifndef _INT16_T #define _INT16_T + #ifndef __int16_t_defined + #define __int16_t_defined typedef $acx_cv_type_int16_t int16_t; #endif + #endif #ifndef _INT32_T #define _INT32_T + #ifndef __int32_t_defined + #define __int32_t_defined typedef $acx_cv_type_int32_t int32_t; #endif + #endif EOF elif test "$ac_cv_type_u_int32_t" = yes; then sed 's/^ *//' >> tmp-stdint.h <<EOF @@ -262,18 +280,27 @@ elif test "$ac_cv_type_u_int32_t" = yes; then #ifndef _UINT8_T #define _UINT8_T + #ifndef __uint8_t_defined + #define __uint8_t_defined typedef u_int8_t uint8_t; #endif + #endif #ifndef _UINT16_T #define _UINT16_T + #ifndef __uint16_t_defined + #define __uint16_t_defined typedef u_int16_t uint16_t; #endif + #endif #ifndef _UINT32_T #define _UINT32_T + #ifndef __uint32_t_defined + #define __uint32_t_defined typedef u_int32_t uint32_t; #endif + #endif EOF else sed 's/^ *//' >> tmp-stdint.h <<EOF @@ -321,8 +348,11 @@ elif test "$ac_cv_type_u_int64_t" = yes; then #endif #ifndef _UINT64_T #define _UINT64_T + #ifndef __uint64_t_defined + #define __uint64_t_defined typedef u_int64_t uint64_t; #endif + #endif EOF elif test -n "$acx_cv_type_int64_t"; then sed 's/^ *//' >> tmp-stdint.h <<EOF @@ -334,8 +364,11 @@ elif test -n "$acx_cv_type_int64_t"; then #endif #ifndef _UINT64_T #define _UINT64_T + #ifndef __uint64_t_defined + #define __uint64_t_defined typedef unsigned $acx_cv_type_int64_t uint64_t; #endif + #endif EOF else sed 's/^ *//' >> tmp-stdint.h <<EOF @@ -344,8 +377,10 @@ else #if defined __STDC_VERSION__ && (__STDC_VERSION__-0) >= 199901L #ifndef _INT64_T #define _INT64_T + #ifndef __int64_t_defined typedef long long int64_t; #endif + #endif #ifndef _UINT64_T #define _UINT64_T typedef unsigned long long uint64_t; @@ -390,8 +425,12 @@ if test "$ac_cv_type_uintptr_t" != yes; then sed 's/^ *//' >> tmp-stdint.h <<EOF /* Define intptr_t based on sizeof(void*) = $ac_cv_sizeof_void_p */ + #ifndef __uintptr_t_defined typedef u$acx_cv_type_intptr_t uintptr_t; + #endif + #ifndef __intptr_t_defined typedef $acx_cv_type_intptr_t intptr_t; + #endif EOF fi |