X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdata%2Fcalendar.c;h=eb9e67250a733394739f997ab1c7b504627b1b50;hb=b5c82cc9aabe7e641011130240ae1b2e84348e23;hp=7330b1a659621d850d4acf9d78ec8fd968bb97e9;hpb=f5c108becd49d78f4898cab11352291f5689d24e;p=pspp-builds.git

diff --git a/src/data/calendar.c b/src/data/calendar.c
index 7330b1a6..eb9e6725 100644
--- a/src/data/calendar.c
+++ b/src/data/calendar.c
@@ -2,8 +2,8 @@
 #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)
@@ -58,7 +58,7 @@ calendar_gregorian_to_offset (int y, int m, int d,
   /* 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;
     }