aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Tobler <a.tobler@schweiz.org>2007-05-19 20:44:43 +0000
committerAndreas Tobler <andreast@gcc.gnu.org>2007-05-19 22:44:43 +0200
commitdbca09c29d08d561ed9f08f1a1f6cfec86700ef4 (patch)
tree6ae6e576fc910b8034959297185139b706d57a9d
parent4e7cb428e91d40277a35c24e7f284dd380d60439 (diff)
downloadgcc-dbca09c29d08d561ed9f08f1a1f6cfec86700ef4.zip
gcc-dbca09c29d08d561ed9f08f1a1f6cfec86700ef4.tar.gz
gcc-dbca09c29d08d561ed9f08f1a1f6cfec86700ef4.tar.bz2
re PR libgcj/31659 (config-int.h:327:1: error: "INT8_MIN" redefined)
2007-05-19 Andreas Tobler <a.tobler@schweiz.org> PR libgcj/31659 * m4/ax_create_stdint_h.m4: Apply patch from PR31659. * configure: Regenerate. From-SVN: r124860
-rw-r--r--libjava/classpath/ChangeLog6
-rwxr-xr-xlibjava/classpath/configure25
-rw-r--r--libjava/classpath/m4/ax_create_stdint_h.m425
3 files changed, 56 insertions, 0 deletions
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 526b254..cf778b4 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-19 Andreas Tobler <a.tobler@schweiz.org>
+
+ PR libgcj/31659
+ * m4/ax_create_stdint_h.m4: Apply patch from PR31659.
+ * configure: Regenerate.
+
2007-05-07 Keith Seitz <keiths@redhat.com>
* gnu/classpath/jdwp/Jdwp.java (notify): Rewrite to call
diff --git a/libjava/classpath/configure b/libjava/classpath/configure
index 16382ca..f2a7bb0 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 acffeb4..453af07 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