3 files changed, 60 insertions, 13 deletions

diff --git a/src/Date.cpp b/src/Date.cpp
index 8b8e650..cbfa123 100644
--- a/src/Date.cpp
+++ b/src/Date.cpp
@@ -34,8 +34,8 @@ Date::Date(plist_t node, Node* parent) : Node(node, parent)
 
 Date::Date(const PList::Date& d) : Node(PLIST_DATE)
 {
-    timeval t = d.GetValue();
-    plist_set_date_val(_node, t.tv_sec, t.tv_usec);
+    int64_t t = d.GetValue();
+    plist_set_unix_date_val(_node, t);
 }
 
 Date& Date::operator=(const PList::Date& d)
@@ -45,9 +45,9 @@ Date& Date::operator=(const PList::Date& d)
     return *this;
 }
 
-Date::Date(timeval t) : Node(PLIST_DATE)
+Date::Date(int64_t t) : Node(PLIST_DATE)
 {
-    plist_set_date_val(_node, t.tv_sec, t.tv_usec);
+    plist_set_unix_date_val(_node, t);
 }
 
 Date::~Date()
@@ -59,18 +59,16 @@ Node* Date::Clone() const
     return new Date(*this);
 }
 
-void Date::SetValue(timeval t)
+void Date::SetValue(int64_t t)
 {
-    plist_set_date_val(_node, t.tv_sec, t.tv_usec);
+    plist_set_unix_date_val(_node, t);
 }
 
-timeval Date::GetValue() const
+int64_t Date::GetValue() const
 {
-    int32_t tv_sec = 0;
-    int32_t tv_usec = 0;
-    plist_get_date_val(_node, &tv_sec, &tv_usec);
-    timeval t = {tv_sec, tv_usec};
-    return t;
+    int64_t sec = 0;
+    plist_get_unix_date_val(_node, &sec);
+    return sec;
 }
 
 }  // namespace PList
diff --git a/src/Node.cpp b/src/Node.cpp
index 0bd428a..1043b31 100644
--- a/src/Node.cpp
+++ b/src/Node.cpp
@@ -73,7 +73,7 @@ Node::Node(plist_type type, Node* parent) : _parent(parent)
         _node = plist_new_data(NULL,0);
         break;
     case PLIST_DATE:
-        _node = plist_new_date(0,0);
+        _node = plist_new_unix_date(0);
         break;
     case PLIST_ARRAY:
         _node = plist_new_array();
diff --git a/src/plist.c b/src/plist.c
index 3f86105..4fc2f00 100644
--- a/src/plist.c
+++ b/src/plist.c
@@ -46,6 +46,8 @@
 #include <hashtable.h>
 #include <ptrarray.h>
 
+#define MAC_EPOCH 978307200
+
 #ifdef _MSC_VER
 typedef SSIZE_T ssize_t;
 #endif
@@ -528,6 +530,15 @@ plist_t plist_new_date(int32_t sec, int32_t usec)
     return plist_new_node(data);
 }
 
+plist_t plist_new_unix_date(int64_t sec)
+{
+    plist_data_t data = plist_new_plist_data();
+    data->type = PLIST_DATE;
+    data->realval = (double)sec - MAC_EPOCH;
+    data->length = sizeof(double);
+    return plist_new_node(data);
+}
+
 plist_t plist_new_null(void)
 {
     plist_data_t data = plist_new_plist_data();
@@ -1392,6 +1403,20 @@ void plist_get_date_val(plist_t node, int32_t * sec, int32_t * usec)
     }
 }
 
+void plist_get_unix_date_val(plist_t node, int64_t *sec)
+{
+    if (!node || !sec)
+        return;
+    plist_type type = plist_get_node_type(node);
+    uint64_t length = 0;
+    double val = 0;
+    if (PLIST_DATE != type)
+        return;
+    plist_get_type_and_value(node, &type, (void *) &val, &length);
+    assert(length == sizeof(double));
+    *sec = (int64_t)val + MAC_EPOCH;
+}
+
 int plist_data_compare(const void *a, const void *b)
 {
     plist_data_t val_a = NULL;
@@ -1551,6 +1576,12 @@ void plist_set_date_val(plist_t node, int32_t sec, int32_t usec)
     plist_set_element_val(node, PLIST_DATE, &val, sizeof(double));
 }
 
+void plist_set_unix_date_val(plist_t node, int64_t sec)
+{
+    double val = (double)(sec - MAC_EPOCH);
+    plist_set_element_val(node, PLIST_DATE, &val, sizeof(double));
+}
+
 int plist_bool_val_is_true(plist_t boolnode)
 {
     if (!PLIST_IS_BOOLEAN(boolnode)) {
@@ -1686,6 +1717,24 @@ int plist_date_val_compare(plist_t datenode, int32_t cmpsec, int32_t cmpusec)
     return 1;
 }
 
+int plist_unix_date_val_compare(plist_t datenode, int64_t cmpval)
+{
+    if (!PLIST_IS_DATE(datenode)) {
+        return -1;
+    }
+    int64_t dateval = 0;
+    plist_get_unix_date_val(datenode, &dateval);
+    if (dateval == cmpval) {
+        return 0;
+    }
+
+    if (dateval < cmpval) {
+        return -1;
+    }
+
+    return 1;
+}
+
 int plist_string_val_compare(plist_t strnode, const char* cmpval)
 {
     if (!PLIST_IS_STRING(strnode)) {