-static int wr_output_data (struct matrix_data_pgm *,
- struct ccase *, write_case_func *, write_case_data);
-static int wr_read_rowtype (const struct matrix_token *, struct file_handle *);
-static int wr_read_factors (struct matrix_data_pgm *);
-static int wr_read_indeps (struct matrix_data_pgm *);
+static int wr_read_rowtype (struct wr_aux_data *,
+ const struct matrix_token *, struct file_handle *);
+static int wr_read_factors (struct wr_aux_data *);
+static int wr_read_indeps (struct wr_aux_data *);