Rename compare_string --> compare_string_3way

[pspp] / src / language / expressions / helpers.h

diff --git a/src/language/expressions/helpers.h b/src/language/expressions/helpers.h
index b8fadc9d245daee3353660d15ec633751f929549..cb59c206a7599334246402cc26265854562d8483 100644 (file)
--- a/src/language/expressions/helpers.h
+++ b/src/language/expressions/helpers.h
@@ -1,4 +1,4 @@
-#ifndef EXPRESSIONS_HELPERS_H 
+#ifndef EXPRESSIONS_HELPERS_H
 #define EXPRESSIONS_HELPERS_H
 
 #include <ctype.h>
@@ -20,7 +20,6 @@
 #include <data/value.h>
 #include <data/variable.h>
 #include <data/vector.h>
-#include <gsl-extras/gsl-extras.h>
 #include <language/expressions/public.h>
 #include <libpspp/compiler.h>
 #include <libpspp/message.h>
@@ -32,7 +31,7 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-static inline double check_errno (double x) 
+static inline double check_errno (double x)
 {
   return errno == 0 ? x : SYSMIS;
 }
@@ -49,7 +48,7 @@ static inline double check_errno (double x)
 
 extern const struct substring empty_string;
 
-int compare_string (const struct substring *, const struct substring *);
+int compare_string_3way (const struct substring *, const struct substring *);
 
 double expr_ymd_to_date (double year, double month, double day);
 double expr_ymd_to_ofs (double year, double month, double day);
@@ -66,9 +65,9 @@ struct substring copy_string (struct expression *,
                               const char *, size_t length);
 
 static inline bool
-is_valid (double d) 
+is_valid (double d)
 {
-  return finite (d) && d != SYSMIS;
+  return isfinite (d) && d != SYSMIS;
 }
 
 size_t count_valid (double *, size_t);