calendar: Use sensible error reporting in calendar_gregorian_to_offset().

[pspp] / src / data / calendar.h

diff --git a/src/data/calendar.h b/src/data/calendar.h
index 1a70592bcf9e6b64277e1c65db4796c29245219f..5535690447ee1c55f24dc3383bca27ddb6aa8931 100644 (file)
--- a/src/data/calendar.h
+++ b/src/data/calendar.h
@@ -1,15 +1,14 @@
 #ifndef CALENDAR_H
 #define CALENDAR_H 1
 
-typedef void calendar_error_func (void *aux, const char *, ...);
-
-double calendar_gregorian_to_offset (int y, int m, int d,
-                                     calendar_error_func *, void *aux);
-void calendar_offset_to_gregorian (int ofs, int *y, int *m, int *d);
+double calendar_gregorian_to_offset (int y, int m, int d, char **errorp);
+void calendar_offset_to_gregorian (int ofs, int *y, int *m, int *d, int *yd);
 int calendar_offset_to_year (int ofs);
 int calendar_offset_to_month (int ofs);
 int calendar_offset_to_mday (int ofs);
 int calendar_offset_to_yday (int ofs);
 int calendar_offset_to_wday (int ofs);
 
+int calendar_days_in_month (int y, int m);
+
 #endif /* calendar.h */