aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/glimits.h12
2 files changed, 13 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 03e0015..d1dac4c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-26 Vladimir Makarov <vmakarov@toke.toronto.redhat.com>
+
+ * glimits.h (USHRT_MAX): Use unsigned suffix if int can not hold
+ it.
+
2001-06-26 Gabriel Dos Reis <gdr@codesourcery.com>
* diagnostic.h (struct diagnostic_context): Add new field.
diff --git a/gcc/glimits.h b/gcc/glimits.h
index 979e715..f0cb0a3 100644
--- a/gcc/glimits.h
+++ b/gcc/glimits.h
@@ -44,10 +44,6 @@
#undef SHRT_MAX
#define SHRT_MAX 32767
-/* Maximum value an `unsigned short int' can hold. (Minimum is 0). */
-#undef USHRT_MAX
-#define USHRT_MAX 65535
-
/* Minimum and maximum values a `signed int' can hold. */
#ifndef __INT_MAX__
#define __INT_MAX__ 2147483647
@@ -57,6 +53,14 @@
#undef INT_MAX
#define INT_MAX __INT_MAX__
+/* Maximum value an `unsigned short int' can hold. (Minimum is 0). */
+#undef USHRT_MAX
+#if INT_MAX < 65535
+#define USHRT_MAX 65535U
+#else
+#define USHRT_MAX 65535
+#endif
+
/* Maximum value an `unsigned int' can hold. (Minimum is 0). */
#undef UINT_MAX
#define UINT_MAX (INT_MAX * 2U + 1)