X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fnpar.h;h=af093ffb9993d4711387bc5542ac5a72c5b87d00;hb=6185ed9b86eaf1f97b8d28076c6c1953d27a83d0;hp=6aed01cf2c3509ff44e25d1a6052f9fc85924de7;hpb=a1efcf97ca2f75f4be6a0389ff2372c03ed2d4e1;p=pspp-builds.git

diff --git a/src/language/stats/npar.h b/src/language/stats/npar.h
index 6aed01cf..af093ffb 100644
--- a/src/language/stats/npar.h
+++ b/src/language/stats/npar.h
@@ -20,18 +20,16 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include <data/missing-values.h>
-
-#include <stddef.h>
-#include <data/missing-values.h>
+#include <data/value.h>
 
 typedef const struct variable *variable_pair[2];
 
-struct hsh_table;
-struct const_hsh_table;
+struct hmapx;
 struct casefilter;
 struct casereader;
 struct dataset;
 
+
 struct npar_test
 {
   void (*execute) (const struct dataset *,
@@ -42,9 +40,10 @@ struct npar_test
 		   double);
 
   void (*insert_variables) (const struct npar_test *,
-			    struct const_hsh_table *);
+			    struct hmapx *);
 };
 
+
 struct one_sample_test
 {
   struct npar_test parent;
@@ -60,4 +59,14 @@ struct two_sample_test
 };
 
 
+struct n_sample_test
+{
+  struct npar_test parent;
+  const struct variable **vars;
+  size_t n_vars;
+
+  union value val1, val2;
+  const struct variable *indep_var;
+};
+
 #endif