Finish converting struct variable to an opaque type. In this

[pspp] / src / math / group.c

diff --git a/src/math/group.c b/src/math/group.c
index 07803183fee58e04679e0ffe51dcba82a054e8c8..87ba02bbff22fdbdf09119d73a1c8a54d83371c8 100644 (file)
--- a/src/math/group.c
+++ b/src/math/group.c
@@ -19,14 +19,14 @@
 
 #include <config.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "compiler.h"
-#include "hash.h"
+#include <libpspp/alloc.h>
+#include <libpspp/compiler.h>
+#include <libpspp/hash.h>
 #include "group.h"
 #include "group-proc.h"
-#include "str.h"
-#include "variable.h"
-#include "misc.h"
+#include <libpspp/str.h>
+#include <data/variable.h>
+#include <libpspp/misc.h>
 
 
 /* Return -1 if the id of a is less than b; +1 if greater than and 
@@ -63,7 +63,11 @@ struct group_proc *
 group_proc_get (struct variable *v)
 {
   /* This is not ideal, obviously. */
-  if (v->aux == NULL) 
-    var_attach_aux (v, xmalloc (sizeof (struct group_proc)), var_dtor_free);
-  return v->aux;
+  struct group_proc *group = var_get_aux (v);
+  if (group == NULL) 
+    {
+      group = xmalloc (sizeof (struct group_proc));
+      var_attach_aux (v, group, var_dtor_free); 
+    }
+  return group;
 }