Categoricals: Use moments instead of keeping cc count ourselves

[pspp] / src / math / categoricals.h

diff --git a/src/math/categoricals.h b/src/math/categoricals.h
index ff33540ca1193148779e5ce7ebd0df4f2cd131f5..09ced7d7acc2a9900fd67039697b98273aaafe0c 100644 (file)
--- a/src/math/categoricals.h
+++ b/src/math/categoricals.h
@@ -28,16 +28,18 @@ struct ccase;
 union value ;
 
 typedef void update_func (void *user_data,
+                         enum mv_class exclude,
                          const struct variable *wv, 
                          const struct variable *catvar,
-                         const struct ccase *c, void *aux);
+                         const struct ccase *c,
+                         void *aux1, void *aux2);
 
-typedef void *user_data_create_func (void);
+typedef void *user_data_create_func (void *aux1, void *aux2);
 
 struct categoricals *categoricals_create (const struct variable *const *v, size_t n_vars,
                                          const struct variable *wv, enum mv_class exclude,
                                          user_data_create_func *udf,
-                                         update_func *update, void *update_aux);
+                                         update_func *update, void *aux1, void *aux2);
 
 void categoricals_destroy (struct categoricals *);