projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
file-handle-def: New function fh_equal().
[pspp]
/
src
/
data
/
calendar.c
diff --git
a/src/data/calendar.c
b/src/data/calendar.c
index a2bb7e600004c6cd025c90e0c26641e12fe30ce0..e07e7d63aca2e9043f7edf692c351147183137e4 100644
(file)
--- a/
src/data/calendar.c
+++ b/
src/data/calendar.c
@@
-71,12
+71,14
@@
raw_gregorian_to_offset (int y, int m, int d)
Gregorian calendar. Returns SYSMIS for dates before 14 Oct
1582. */
double
Gregorian calendar. Returns SYSMIS for dates before 14 Oct
1582. */
double
-calendar_gregorian_to_offset (int y, int m, int d, char **errorp)
+calendar_gregorian_to_offset (int y, int m, int d,
+ const struct fmt_settings *settings,
+ char **errorp)
{
/* Normalize year. */
if (y >= 0 && y < 100)
{
{
/* Normalize year. */
if (y >= 0 && y < 100)
{
- int epoch =
settings_get_epoch (
);
+ int epoch =
fmt_settings_get_epoch (settings
);
int century = epoch / 100 + (y < epoch % 100);
y += century * 100;
}
int century = epoch / 100 + (y < epoch % 100);
y += century * 100;
}