Partial merge of branch/2012-07-23/cet-transform, excluding cet-specific parts.

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

1 files changed, 7 insertions, 0 deletions

diff --git a/mps/code/testlib.h b/mps/code/testlib.h
index 3d187080fc2..d16f4fb6eef 100644
--- a/mps/code/testlib.h
+++ b/mps/code/testlib.h
@@ -88,6 +88,7 @@
 #define PRIXLONGEST "llX"
 #define PRIwWORD "16"
 typedef unsigned long long ulongest_t;
+typedef long long longest_t;
 #define MPS_WORD_CONST(n) (n##ull)
 #else
 #define PRIuLONGEST "lu"
@@ -95,6 +96,7 @@ typedef unsigned long long ulongest_t;
 #define PRIXLONGEST "lX"
 #define PRIwWORD "8"
 typedef unsigned long ulongest_t;
+typedef long longest_t;
 #define MPS_WORD_CONST(n) (n##ul)
 #endif
 #define PRIXPTR     "0"PRIwWORD PRIXLONGEST
@@ -164,6 +166,11 @@ extern void verror(const char *format, va_list args);
     cdie(cond, condstring "\n" __FILE__ "\n" STR(__LINE__))
 
 
+/* fail -- like assert, but (notionally) returns a value, so usable in an expression */
+
+extern int fail(void);
+
+
 /* rnd -- random number generator
  *
  * rnd() generates a sequence of integers in the range [1, 2^31-2].