-// Assumption: sizeof(long) == sizeof(void*)
- #define intPsize long_bitsize
- typedef long sintP;
- typedef unsigned long uintP;
+// Assumption: sizeof(intptr_t) == sizeof(void*)
+ #define intPsize pointer_bitsize
+ typedef intptr_t sintP;
+ typedef uintptr_t uintP;
+
+// Integer type used for the value of a fixnum.
+ // It must be like this, because in a couple of places we assume
+ // cl_value_shift + cl_value_len == cl_pointer_size.
+ #define intVsize intPsize
+ typedef sintP sintV;
+ typedef uintP uintV;