From: John David Anglin Date: Wed, 6 Sep 2000 06:09:15 +0000 (+0000) Subject: John David Anglin X-Git-Tag: prereleases/libstdc++-2.92~4242 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=702edf390ceddc7ece586e6d57030cb54f531996;p=thirdparty%2Fgcc.git John David Anglin * gettext.h (nls_uint32): Choose via INT_MAX instead of UINT_MAX. From-SVN: r36180 --- diff --git a/gcc/intl/ChangeLog b/gcc/intl/ChangeLog index 48d0d7069acd..1754c116dd3f 100644 --- a/gcc/intl/ChangeLog +++ b/gcc/intl/ChangeLog @@ -1,3 +1,7 @@ +2000-09-05 John David Anglin + + * gettext.h (nls_uint32): Choose via INT_MAX instead of UINT_MAX. + 2000-08-02 Zack Weinberg * dcgettext.c (find_msg): Initialize act before loop. diff --git a/gcc/intl/gettext.h b/gcc/intl/gettext.h index 3cd23d7d6ad9..7daee9417ec3 100644 --- a/gcc/intl/gettext.h +++ b/gcc/intl/gettext.h @@ -39,30 +39,27 @@ alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but doing that would require that the configure script compile and *run* the resulting executable. Locally running cross-compiled executables - is usually not possible. */ + is usually not possible. We use the maximum values for signed int's + for the test to avoid using `U' suffixes. */ -#if __STDC__ -# define UINT_MAX_32_BITS 4294967295U -#else -# define UINT_MAX_32_BITS 0xFFFFFFFF -#endif +#define INT_MAX_32_BITS 2147483647 -/* If UINT_MAX isn't defined, assume it's a 32-bit type. +/* If INT_MAX isn't defined, assume it's a 32-bit type. This should be valid for all systems GNU cares about because that doesn't include 16-bit systems, and only modern systems (that certainly have ) have 64+-bit integral types. */ -#ifndef UINT_MAX -# define UINT_MAX UINT_MAX_32_BITS +#ifndef INT_MAX +# define INT_MAX INT_MAX_32_BITS #endif -#if UINT_MAX == UINT_MAX_32_BITS +#if INT_MAX == INT_MAX_32_BITS typedef unsigned nls_uint32; #else -# if USHRT_MAX == UINT_MAX_32_BITS +# if SHRT_MAX == INT_MAX_32_BITS typedef unsigned short nls_uint32; # else -# if ULONG_MAX == UINT_MAX_32_BITS +# if LONG_MAX == INT_MAX_32_BITS typedef unsigned long nls_uint32; # else /* The following line is intended to throw an error. Using #error is