X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Farray.c;h=a0ac943af66bc8fceffce5ca8babcd7d3d5dbfe6;hb=4bc7fb8814bc15858ab801be55b3b6cd79dd06e6;hp=942974c8cf42114ef39cece0fb52ae0e3355904a;hpb=d0b91eae59319ab2756d0d43b9cb15eb9cd3c234;p=pspp diff --git a/src/libpspp/array.c b/src/libpspp/array.c index 942974c8cf..a0ac943af6 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 @@ -84,14 +84,16 @@ . */ #include + #include "array.h" + #include #include #include -#include +#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;