X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/c846879ccf3e86ea293c157f4aa2ff8716fb5b4c..8656dc507aee9c5dcb3a6ad876565f5fcac425ae:/testrig.h

diff --git a/testrig.h b/testrig.h
index 10b8fd9..69b2868 100644
--- a/testrig.h
+++ b/testrig.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: testrig.h,v 1.2 1999/05/05 18:50:31 mdw Exp $
+ * $Id: testrig.h,v 1.7 2004/04/08 01:36:13 mdw Exp $
  *
  * Generic test driver
  *
@@ -22,23 +22,13 @@
  * GNU Library General Public License for more details.
  * 
  * You should have received a copy of the GNU Library General Public
- * License along with mLib; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * License along with mLib; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: testrig.h,v $
- * Revision 1.2  1999/05/05 18:50:31  mdw
- * Change licensing conditions to LGPL.
- *
- * Revision 1.1.1.1  1998/06/17 23:44:42  mdw
- * Initial version of mLib
- *
- */
-
-#ifndef TESTER_H
-#define TESTER_H
+#ifndef MLIB_TESTER_H
+#define MLIB_TESTER_H
 
 #ifdef __cplusplus
   extern "C" {
@@ -48,6 +38,7 @@
 
 #include <stddef.h>
 
+#include "bits.h"
 #include "dstr.h"
 
 /*----- Magical numbers ---------------------------------------------------*/
@@ -67,15 +58,18 @@ typedef struct test_type {
 
 typedef struct test_chunk {
   const char *name;			/* Name of this chunk */
-  int (*test)(dstr dv[]);		/* Test verification function */
-  test_type *f[TEST_FIELDMAX];		/* Field definitions */
+  int (*test)(dstr /*dv*/[]);		/* Test verification function */
+  const test_type *f[TEST_FIELDMAX];	/* Field definitions */
 } test_chunk;
 
 /*----- Predefined data types ---------------------------------------------*/
 
-extern test_type type_hex;
-extern test_type type_string;
-extern test_type type_int;
+extern const test_type type_hex;
+extern const test_type type_string;
+extern const test_type type_int;
+extern const test_type type_long;
+extern const test_type type_ulong;
+extern const test_type type_uint32;
 
 /*----- Functions provided ------------------------------------------------*/