1 files changed, 15 insertions, 4 deletions

diff --git a/tools/idevicebackup.c b/tools/idevicebackup.c
index c0537b8..363abad 100644
--- a/tools/idevicebackup.c
+++ b/tools/idevicebackup.c
@@ -35,6 +35,7 @@
 #include <unistd.h>
 #include <ctype.h>
 #include <time.h>
+#include <sys/stat.h>
 
 #include <libimobiledevice/libimobiledevice.h>
 #include <libimobiledevice/lockdown.h>
@@ -51,7 +52,7 @@
 #define LOCK_ATTEMPTS 50
 #define LOCK_WAIT 200000
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <windows.h>
 #define sleep(x) Sleep(x*1000)
 #endif
@@ -175,7 +176,13 @@ static plist_t mobilebackup_factory_info_plist_new(const char* udid)
         if (value_node)
                 plist_dict_set_item(ret, "IMEI", plist_copy(value_node));
 
-        plist_dict_set_item(ret, "Last Backup Date", plist_new_date(time(NULL) - MAC_EPOCH, 0));
+        plist_dict_set_item(ret, "Last Backup Date",
+#ifdef HAVE_PLIST_UNIX_DATE
+                plist_new_unix_date(time(NULL))
+#else
+                plist_new_date(time(NULL) - MAC_EPOCH, 0)
+#endif
+        );
 
         value_node = plist_dict_get_item(root_node, "ProductType");
         plist_dict_set_item(ret, "Product Type", plist_copy(value_node));
@@ -212,7 +219,11 @@ static void mobilebackup_info_update_last_backup_date(plist_t info_plist)
                 return;
 
         node = plist_dict_get_item(info_plist, "Last Backup Date");
+#ifdef HAVE_PLIST_UNIX_DATE
+        plist_set_unix_date_val(node, time(NULL));
+#else
         plist_set_date_val(node, time(NULL) - MAC_EPOCH, 0);
+#endif
 
         node = NULL;
 }
@@ -642,7 +653,7 @@ int main(int argc, char *argv[])
         /* we need to exit cleanly on running backups and restores or we cause havok */
         signal(SIGINT, clean_exit);
         signal(SIGTERM, clean_exit);
-#ifndef WIN32
+#ifndef _WIN32
         signal(SIGQUIT, clean_exit);
         signal(SIGPIPE, SIG_IGN);
 #endif
@@ -1352,7 +1363,7 @@ files_out:
                                                 file_info_path = mobilebackup_build_path(backup_directory, hash, ".mddata");
 
                                                 /* determine file size */
-#ifdef WIN32
+#ifdef _WIN32
                                                 struct _stati64 fst;
                                                 if (_stati64(file_info_path, &fst) != 0)
 #else