X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Fhelpers.h;h=895ec49bc90b30eaac7b7a1b208839fc3d6905f0;hb=2764b3157e26955a31af5f4aa7d14e27098ddf19;hp=124868cc6b50d70a65a493331da029692542f554;hpb=8acca2de53c1852f38726f70fc6516b34732a79f;p=pspp-builds.git

diff --git a/src/language/expressions/helpers.h b/src/language/expressions/helpers.h
index 124868cc..895ec49b 100644
--- 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>
@@ -19,7 +19,7 @@
 #include <data/settings.h>
 #include <data/value.h>
 #include <data/variable.h>
-#include <gsl-extras/gsl-extras.h>
+#include <data/vector.h>
 #include <language/expressions/public.h>
 #include <libpspp/compiler.h>
 #include <libpspp/message.h>
@@ -31,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;
 }
@@ -44,6 +44,7 @@ static inline double check_errno (double x)
 #define H_MIN 60.                       /* Minutes per hour. */
 #define MIN_S 60.                       /* Seconds per minute. */
 #define WEEK_DAY 7.                     /* Days per week. */
+#define WEEK_S (WEEK_DAY * DAY_S)       /* Seconds per week. */
 
 extern const struct substring empty_string;
 
@@ -54,15 +55,19 @@ double expr_ymd_to_ofs (double year, double month, double day);
 double expr_wkyr_to_date (double wk, double yr);
 double expr_yrday_to_date (double yr, double day);
 double expr_yrmoda (double year, double month, double day);
+double expr_date_difference (double date1, double date2,
+                             struct substring unit);
+double expr_date_sum (double date, double quantity, struct substring unit_name,
+                      struct substring method_name);
 
 struct substring alloc_string (struct expression *, size_t length);
 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);