X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/d546887cd6d807f258fc4fb2f47a655310e356ba..9786185611c072036751fdfcc1731158a0c2d20c:/t/test.h

diff --git a/t/test.h b/t/test.h
index a6382e2..2a872f7 100644
--- a/t/test.h
+++ b/t/test.h
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012, 2020, 2022-2023 Nick Bowler
+ * Copyright © 2012, 2020, 2022-2024 Nick Bowler
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,6 +28,19 @@
 #endif
 
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+
+/*
+ * The test_uintmax typedef is interchangeable with cdecl_uintmax defined in
+ * <cdecl.h>, but we may want to avoid including that header for some tests.
+ */
+#if HAVE_UNSIGNED_LONG_LONG_INT
+typedef unsigned long long test_uintmax;
+#elif HAVE_UNSIGNED___INT64
+typedef unsigned __int64 test_uintmax;
+#else
+typedef unsigned long test_uintmax;
+#endif
 
 struct cdecl_declspec;
 struct option;
@@ -35,14 +48,16 @@ struct cdecl;
 
 struct test_rng;
 
+void print_error(const char *fmt, ...);
+
 void *malloc_nofail(size_t size);
 void *realloc_nofail(void *ptr, size_t size);
 
-bool test_strtoumax(uintmax_t *out, const char *s, uintmax_t limit);
+bool test_strtoumax(test_uintmax *out, const char *s, test_uintmax limit);
 
 static inline bool test_strtoul(unsigned long *val, const char *str)
 {
-	uintmax_t v;
+	test_uintmax v;
 	bool rc;
 
 	rc = test_strtoumax(&v, str, (unsigned long)-1);
@@ -80,6 +95,10 @@ static inline int test_rng_50_50(struct test_rng *rng)
 #define VERSION_NO_COPYRIGHT_SYMBOL 1
 #include "version.h"
 
+#ifdef PROGNAME
+const char *progname = PROGNAME;
+#endif
+
 #define test_print_version(s) \
 	do_print_version(s " (" PACKAGE_NAME ") " PACKAGE_VERSION)