Re: Portability bug with UINTPTR_MAX in Solaris/Forte

[Matthias Koeppe]

Kevin Ryde <address@hidden> writes:

> Matthias Koeppe <address@hidden> writes:
>> +/* On Solaris 7 and 8, /usr/include/sys/int_limits.h defines
>> +   INTPTR_MAX and UINTPTR_MAX to empty, INTPTR_MIN is not defined.
>
> That's a typo there is it?  Only UINTPTR_MAX defined to empty.

No, it's exactly as I wrote.  From int_limits.h:

| /*
|  * The following 2 macros are provided for testing whether the types
|  * intptr_t and uintptr_t (integers large enough to hold a void *) are
|  * defined in this header. They are needed in case the architecture can't
|  * represent a pointer in any standard integral type.
|  */
| #define INTPTR_MAX
| #define UINTPTR_MAX
 
>> +#if SCM_SIZEOF_INTPTR_T != 0 && defined(INTPTR_MAX) && defined(INTPTR_MIN) 
>> && INTPTR_MAX-0 != 0 && INTPTR_MIN-0 != 0
>
> While you're at it you might like to merge the tests so scm_t_bits and
> scm_t_signed_bits are both based on "intptr" stuff, or both on "long",
> rather than having separate conditionals.  Wouldn't want them to come
> out different.

OK, here is an updated patch.  Will you commit this change?  (I don't
have CVS write permissions.)

--- tags.h.~1.103.~     Mon Jun 16 16:50:07 2003
+++ tags.h      Wed Jun 25 16:51:10 2003
@@ -39,24 +39,30 @@
 
 /* In the beginning was the Word:
  */
-#if SCM_SIZEOF_INTPTR_T != 0 && defined(INTPTR_MAX) && defined(INTPTR_MIN)
+/* On Solaris 7 and 8, /usr/include/sys/int_limits.h defines
+   INTPTR_MAX and UINTPTR_MAX to empty, INTPTR_MIN is not defined.
+   To avoid uintptr_t and intptr_t in this case we require
+   UINTPTR_MAX-0 != 0 etc.  */
+#if SCM_SIZEOF_INTPTR_T != 0 && defined(INTPTR_MAX) && defined(INTPTR_MIN) \
+  && INTPTR_MAX-0 != 0 && INTPTR_MIN-0 != 0 \
+  && SCM_SIZEOF_UINTPTR_T != 0 && defined(UINTPTR_MAX) && UINTPTR_MAX-0 != 0
+
 typedef intptr_t scm_t_signed_bits;
 #define SCM_T_SIGNED_BITS_MAX INTPTR_MAX
 #define SCM_T_SIGNED_BITS_MIN INTPTR_MIN
-#else
-typedef signed long scm_t_signed_bits;
-#define SCM_T_SIGNED_BITS_MAX LONG_MAX
-#define SCM_T_SIGNED_BITS_MIN LONG_MIN
-#endif
-
-#if SCM_SIZEOF_UINTPTR_T != 0 && defined(UINTPTR_MAX)
 typedef uintptr_t scm_t_bits;
 #define SIZEOF_SCM_T_BITS SCM_SIZEOF_UINTPTR_T
 #define SCM_T_BITS_MAX UINTPTR_MAX
+
 #else
+
+typedef signed long scm_t_signed_bits;
+#define SCM_T_SIGNED_BITS_MAX LONG_MAX
+#define SCM_T_SIGNED_BITS_MIN LONG_MIN
 typedef unsigned long scm_t_bits;
 #define SIZEOF_SCM_T_BITS SCM_SIZEOF_UNSIGNED_LONG
 #define SCM_T_BITS_MAX ULONG_MAX
+
 #endif
 
 /* But as external interface, we use SCM, which may, according to the desired

-- 
Matthias Koeppe -- http://www.math.uni-magdeburg.de/~mkoeppe