Merge commit 'origin/stable'

[pspp-builds.git] / src / math / group.h

diff --git a/src/math/group.h b/src/math/group.h
index 1967e6550c45365264bb8832d1cd3bff1a530bec..c5470b2578f2a1948e66a1ca6e6ae220d1616ecb 100644 (file)
--- a/src/math/group.h
+++ b/src/math/group.h
@@ -18,10 +18,8 @@
 #ifndef GROUP_H
 #define GROUP_H
 
-
 #include <data/value.h>
 
-
 /* Statistics for grouped data */
 struct group_statistics
   {
@@ -64,24 +62,22 @@ struct group_statistics
     /* min and max values */
     double minimum ;
     double maximum ;
-
-
   };
 
 
-
+struct variable ;
 
 /* These funcs are useful for hash tables */
 
 /* Return -1 if the id of a is less than b; +1 if greater than and
    0 if equal */
-int  compare_group(const struct group_statistics *a,
-                  const struct group_statistics *b,
-                  int width);
+int  compare_group (const void *a,
+                   const void *b,
+                   const void *var);
 
-unsigned hash_group(const struct group_statistics *g, int width);
+unsigned int hash_group (const void *g, const void *var);
 
-void  free_group(struct group_statistics *v, void *aux);
+void  free_group (struct group_statistics *v, void *aux);