-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);