X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fpercentiles.c;h=4b5f9c2f7aba8983c742d38df844227db22e3ae0;hb=df936ae7a823634e599df091f8ae935d7842fbaa;hp=4d7b148147d0af97f488d6a0e080813dceb720bd;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp-builds.git

diff --git a/src/math/percentiles.c b/src/math/percentiles.c
index 4d7b1481..4b5f9c2f 100644
--- a/src/math/percentiles.c
+++ b/src/math/percentiles.c
@@ -1,7 +1,6 @@
 /* PSPP - A program for statistical analysis . -*-c-*-
 
 Copyright (C) 2004 Free Software Foundation, Inc.
-Author: John Darrington 2004
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
@@ -19,17 +18,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA. */
 
 #include <config.h>
+#include <assert.h>
+#include <libpspp/compiler.h>
 #include "factor-stats.h"
 #include "percentiles.h"
-#include "misc.h"
+#include <libpspp/misc.h>
+
+#include "minmax.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
-#include <assert.h>
-
-
 struct ptile_params
 {
   double g1, g1_star;
@@ -38,7 +38,7 @@ struct ptile_params
 };
 
 
-const char *ptile_alg_desc[] = {
+const char *const ptile_alg_desc[] = {
   "",
   N_("HAverage"),
   N_("Weighted Average"),
@@ -336,7 +336,7 @@ tukey_hinges(const struct weighted_value **wv,
   
   for ( i = 0 ; i < n_data ; ++i ) 
     {
-      c_star = min(c_star, wv[i]->w);
+      c_star = MIN(c_star, wv[i]->w);
     }
 
   if ( c_star > 1 ) c_star = 1;