X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Ft-test.q;h=c0e90705c3e1fae05af88fcfab7244226697f246;hb=a9acce47d67e0ab35ce1690e4f1b1ac0121c2d78;hp=79e5bf6167cb42aeef71137a7fadd98e6000bfe3;hpb=a0a06d76c05d0c76c9a88461d4ccf0a96eb67390;p=pspp-builds.git

diff --git a/src/language/stats/t-test.q b/src/language/stats/t-test.q
index 79e5bf61..c0e90705 100644
--- a/src/language/stats/t-test.q
+++ b/src/language/stats/t-test.q
@@ -147,7 +147,7 @@ struct pair
 
 static struct pair *pairs=0;
 
-static int parse_value (struct lexer *lexer, union value * v, enum var_type);
+static int parse_value (struct lexer *lexer, union value * v, enum val_type);
 
 /* Structures and Functions for the Statistics Summary Box */
 struct ssbox;
@@ -484,9 +484,9 @@ tts_custom_pairs (struct lexer *lexer, struct dataset *ds, struct cmd_t_test *cm
 	{
 	  free (vars);
 	  msg (SE, _("PAIRED was specified but the number of variables "
-		     "preceding WITH (%d) did not match the number "
-		     "following (%d)."),
-	       (int) n_before_WITH, (int) n_after_WITH );
+		     "preceding WITH (%zu) did not match the number "
+		     "following (%zu)."),
+               n_before_WITH, n_after_WITH);
 	  return 0;
 	}
       n_pairs_local = n_before_WITH;
@@ -565,9 +565,9 @@ tts_custom_pairs (struct lexer *lexer, struct dataset *ds, struct cmd_t_test *cm
 /* Parses the current token (numeric or string, depending on type)
     value v and returns success. */
 static int
-parse_value (struct lexer *lexer, union value * v, enum var_type type)
+parse_value (struct lexer *lexer, union value * v, enum val_type type)
 {
-  if (type == VAR_NUMERIC)
+  if (type == VAL_NUMERIC)
     {
       if (!lex_force_num (lexer))
 	return 0;