From dbca09c29d08d561ed9f08f1a1f6cfec86700ef4 Mon Sep 17 00:00:00 2001 From: Andreas Tobler Date: Sat, 19 May 2007 20:44:43 +0000 Subject: [PATCH] re PR libgcj/31659 (config-int.h:327:1: error: "INT8_MIN" redefined) 2007-05-19 Andreas Tobler PR libgcj/31659 * m4/ax_create_stdint_h.m4: Apply patch from PR31659. * configure: Regenerate. From-SVN: r124860 --- libjava/classpath/ChangeLog | 6 ++++++ libjava/classpath/configure | 25 ++++++++++++++++++++++ libjava/classpath/m4/ax_create_stdint_h.m4 | 25 ++++++++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 526b254ca2a..cf778b4a090 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,9 @@ +2007-05-19 Andreas Tobler + + PR libgcj/31659 + * m4/ax_create_stdint_h.m4: Apply patch from PR31659. + * configure: Regenerate. + 2007-05-07 Keith Seitz * gnu/classpath/jdwp/Jdwp.java (notify): Rewrite to call diff --git a/libjava/classpath/configure b/libjava/classpath/configure index 16382ca2d37..f2a7bb02de3 100755 --- a/libjava/classpath/configure +++ b/libjava/classpath/configure @@ -22420,21 +22420,46 @@ typedef long intptr_t; /* These limits are merily those of a two complement byte-oriented system */ /* Minimum of signed integral types. */ +#ifndef INT8_MIN # define INT8_MIN (-128) +#endif +#ifndef INT16_MIN # define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN # define INT32_MIN (-2147483647-1) +#endif +#ifndef INT64_MIN # define INT64_MIN (-__INT64_C(9223372036854775807)-1) +#endif + /* Maximum of signed integral types. */ +#ifndef INT8_MAX # define INT8_MAX (127) +#endif +#ifndef INT16_MAX # define INT16_MAX (32767) +#endif +#ifndef INT32_MAX # define INT32_MAX (2147483647) +#endif +#ifndef INT64_MAX # define INT64_MAX (__INT64_C(9223372036854775807)) +#endif /* Maximum of unsigned integral types. */ +#ifndef UINT8_MAX # define UINT8_MAX (255) +#endif +#ifndef UINT16_MAX # define UINT16_MAX (65535) +#endif +#ifndef UINT32_MAX # define UINT32_MAX (4294967295U) +#endif +#ifndef UINT64_MAX # define UINT64_MAX (__UINT64_C(18446744073709551615)) +#endif /* Minimum of signed integral types having a minimum size. */ # define INT_LEAST8_MIN INT8_MIN diff --git a/libjava/classpath/m4/ax_create_stdint_h.m4 b/libjava/classpath/m4/ax_create_stdint_h.m4 index acffeb45c65..453af07480e 100644 --- a/libjava/classpath/m4/ax_create_stdint_h.m4 +++ b/libjava/classpath/m4/ax_create_stdint_h.m4 @@ -621,21 +621,46 @@ typedef long intptr_t; /* These limits are merily those of a two complement byte-oriented system */ /* Minimum of signed integral types. */ +#ifndef INT8_MIN # define INT8_MIN (-128) +#endif +#ifndef INT16_MIN # define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN # define INT32_MIN (-2147483647-1) +#endif +#ifndef INT64_MIN # define INT64_MIN (-__INT64_C(9223372036854775807)-1) +#endif + /* Maximum of signed integral types. */ +#ifndef INT8_MAX # define INT8_MAX (127) +#endif +#ifndef INT16_MAX # define INT16_MAX (32767) +#endif +#ifndef INT32_MAX # define INT32_MAX (2147483647) +#endif +#ifndef INT64_MAX # define INT64_MAX (__INT64_C(9223372036854775807)) +#endif /* Maximum of unsigned integral types. */ +#ifndef UINT8_MAX # define UINT8_MAX (255) +#endif +#ifndef UINT16_MAX # define UINT16_MAX (65535) +#endif +#ifndef UINT32_MAX # define UINT32_MAX (4294967295U) +#endif +#ifndef UINT64_MAX # define UINT64_MAX (__UINT64_C(18446744073709551615)) +#endif /* Minimum of signed integral types having a minimum size. */ # define INT_LEAST8_MIN INT8_MIN