--- a/test/call_suite/cases.c	Sun Mar 20 14:26:55 2022 +0100
+++ b/test/call_suite/cases.c	Mon Mar 21 10:02:04 2022 +0100
@@ -31,19 +31,19 @@
 #define ret_i(X) return(K_i[X]);
 #define ret_j(X) return(K_j[X]);
 #define ret_l(X) return(K_l[X]);
+#define ret_C(X) return(K_C[X]);
+#define ret_S(X) return(K_S[X]);
+#define ret_I(X) return(K_I[X]);
+#define ret_J(X) return(K_J[X]);
+#define ret_L(X) return(K_L[X]);
 #define ret_p(X) return(K_p[X]);
 #define ret_f(X) return(K_f[X]);
 #define ret_d(X) return(K_d[X]);
 
 #define v void
-#define c char
-#define s short
-#define i int
-#define j long
-#define l long long
-#define p void*
-#define f float
-#define d double
+#define X(CH,T) typedef T CH;
+DEF_TYPES
+#undef X
 
 #include "cases.h"