X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Farray.c;h=9114582c282afae576e20d7f4ac502eaa29607af;hb=f790dbda9d498eef9c9c0a49078adbeecf768d56;hp=942974c8cf42114ef39cece0fb52ae0e3355904a;hpb=32669655d196fa0983ba23d1c55b8c81883e04d3;p=pspp

diff --git a/src/libpspp/array.c b/src/libpspp/array.c
index 942974c8cf..9114582c28 100644
--- a/src/libpspp/array.c
+++ b/src/libpspp/array.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -80,18 +80,20 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see 
+   License along with the GNU C Library.  If not, see
    <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
+
 #include "array.h"
+
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include <libpspp/assertion.h>
+#include "libpspp/assertion.h"
 
-#include "xalloc.h"
-#include "minmax.h"
+#include "gl/xalloc.h"
+#include "gl/minmax.h"
 
 /* Finds an element in ARRAY, which contains COUNT elements of
    SIZE bytes each, using COMPARE for comparisons.  Returns the
@@ -638,7 +640,7 @@ typedef struct
 
 void
 sort (void *array, size_t count, size_t size,
-	    algo_compare_func *compare, const void *aux)
+      algo_compare_func *compare, const void *aux)
 {
   char *const first = array;
   const size_t max_thresh = MAX_THRESH * size;