projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
range-set: Inline some simple functions.
[pspp-builds.git]
/
src
/
data
/
calendar.c
diff --git
a/src/data/calendar.c
b/src/data/calendar.c
index 7330b1a659621d850d4acf9d78ec8fd968bb97e9..eb9e67250a733394739f997ab1c7b504627b1b50 100644
(file)
--- a/
src/data/calendar.c
+++ b/
src/data/calendar.c
@@
-2,8
+2,8
@@
#include "calendar.h"
#include <assert.h>
#include <stdbool.h>
#include "calendar.h"
#include <assert.h>
#include <stdbool.h>
-#include
"settings.h"
-#include
"value.h"
+#include
<data/settings.h>
+#include
<data/val-type.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-58,7
+58,7
@@
calendar_gregorian_to_offset (int y, int m, int d,
/* Normalize year. */
if (y >= 0 && y < 100)
{
/* Normalize year. */
if (y >= 0 && y < 100)
{
- int epoch = get_epoch ();
+ int epoch =
settings_
get_epoch ();
int century = epoch / 100 + (y < epoch % 100);
y += century * 100;
}
int century = epoch / 100 + (y < epoch % 100);
y += century * 100;
}