X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fgroup.c;h=3978f2fb948818805c1c9045637ad8e1f2f0f727;hb=8b5eeea8fa0ed31ab3f174647ef111db39c1e177;hp=07803183fee58e04679e0ffe51dcba82a054e8c8;hpb=2322678e8fddbbf158b01b2720db2636404bba3b;p=pspp-builds.git

diff --git a/src/math/group.c b/src/math/group.c
index 07803183..3978f2fb 100644
--- a/src/math/group.c
+++ b/src/math/group.c
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-   Written by John Darrington <john@darrington.wattle.id.au>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -19,14 +18,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 +62,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;
 }