Fixing up occurences of "unsigned long" in the main mps and test code so that we no longer assume that "unsigned long" is large enough for a pointer or size, or that it's the longest available integer type, since these are not true on 64-bit windows.

Copied from Perforce
 Change: 178021
 ServerID: perforce.ravenbrook.com

1 files changed, 24 insertions, 0 deletions

diff --git a/mps/code/testlib.h b/mps/code/testlib.h
index 2a70fa81f58..63d462a6658 100644
--- a/mps/code/testlib.h
+++ b/mps/code/testlib.h
@@ -75,6 +75,30 @@
 #endif /* MPS_BUILD_MV */
 
 
+/* ulongest_t -- longest unsigned integer type
+ *
+ * Define a longest unsigned integer type for testing and printing.  We'd
+ * like to use C99's uintmax_t and PRIuMAX here, but the MPS is in C89
+ * and C99 isn't supported by Microsoft.
+ *
+ * We avoid using the ones defined in mpstd.h because we want the tests to
+ * root out any incompatible assumptions by breaking.
+ */
+
+#ifdef MPS_PF_W3I6MV
+#define PRIuLONGEST "llu"
+#define PRIXLONGEST "llX"
+#define PRIwLONGEST "16"
+typedef unsigned long long ulongest_t;
+#else
+#define PRIuLONGEST "lu"
+#define PRIXLONGEST "lX"
+#define PRIwLONGEST "8"
+typedef unsigned long ulongest_t;
+#endif
+#define PRIXPTR     "0"PRIwLONGEST PRIXLONGEST
+
+
 /* testlib_unused -- declares that a variable is unused
  *
  * It should be used to prevent compiler warnings about unused