From be274b21f72fc0ecf9dde15b0969ae505d2abb67 Mon Sep 17 00:00:00 2001 From: David Edelsohn Date: Mon, 17 Aug 2009 15:22:04 +0000 Subject: inclhack.def (aix_complex): Redefine _Complex_I. * inclhack.def (aix_complex): Redefine _Complex_I. Do not redefine I. * (aix_stdint_[12345]): New fixes. * fixincl.x: Regenerate. * tests/base/complex.h: Update check. * tests/base/stdint.h: Add AIX stdint.h checks. From-SVN: r150846 --- fixincludes/tests/base/complex.h | 4 ++-- fixincludes/tests/base/stdint.h | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) (limited to 'fixincludes/tests') diff --git a/fixincludes/tests/base/complex.h b/fixincludes/tests/base/complex.h index c1447d4..d7f2c31 100644 --- a/fixincludes/tests/base/complex.h +++ b/fixincludes/tests/base/complex.h @@ -10,8 +10,8 @@ #if defined( AIX_COMPLEX_CHECK ) -# define _Complex_I (__extension__ 1.0iF) -#define I _Complex_I +#define _Complex_I (__extension__ 1.0iF) + #endif /* AIX_COMPLEX_CHECK */ diff --git a/fixincludes/tests/base/stdint.h b/fixincludes/tests/base/stdint.h index 77e77fa..ae7b12e 100644 --- a/fixincludes/tests/base/stdint.h +++ b/fixincludes/tests/base/stdint.h @@ -9,6 +9,45 @@ +#if defined( AIX_STDINT_1_CHECK ) +#define UINT8_MAX (255U) +#define UINT16_MAX (65535U) +#endif /* AIX_STDINT_1_CHECK */ + + +#if defined( AIX_STDINT_2_CHECK ) +#define INTPTR_MIN INT64_MIN +#define INTPTR_MAX INT64_MAX +#define UINTPTR_MAX UINT64_MAX +#else +#define INTPTR_MIN INT32_MIN +#define INTPTR_MAX INT32_MAX +#define UINTPTR_MAX UINT32_MAX +#endif /* AIX_STDINT_2_CHECK */ + + +#if defined( AIX_STDINT_3_CHECK ) +#define PTRDIFF_MIN INT64_MIN +#define PTRDIFF_MAX INT64_MAX +#else +#define PTRDIFF_MIN INT32_MIN +#define PTRDIFF_MAX INT32_MAX +#endif /* AIX_STDINT_3_CHECK */ + + +#if defined( AIX_STDINT_4_CHECK ) +#define SIZE_MAX UINT64_MAX +#else +#define SIZE_MAX UINT32_MAX +#endif /* AIX_STDINT_4_CHECK */ + + +#if defined( AIX_STDINT_5_CHECK ) +#define UINT8_C(c) __CONCAT__(c,U) +#define UINT16_C(c) __CONCAT__(c,U) +#endif /* AIX_STDINT_5_CHECK */ + + #if defined( DARWIN_STDINT_1_CHECK ) #define UINT8_C(c) __UINT8_C(c) #define UINT16_C(c) __UINT16_C(c) -- cgit v1.1