Update all #include directives to the currently preferred style.

[pspp-builds.git] / src / libpspp / array.c

diff --git a/src/libpspp/array.c b/src/libpspp/array.c
index 942974c8cf42114ef39cece0fb52ae0e3355904a..a0ac943af66bc8fceffce5ca8babcd7d3d5dbfe6 100644 (file)
--- 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 @@
    <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"
 \f
 /* 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;