Merge branch 'time-function'

Merge the 64-bit timestamp_t time function branch.

This makes subsurface not only safe against the 2038-year problem, but
also avoids the use of thread-unsafe gmtime() etc.

We still use the system time_t for initializing the calendar widget for
adding a new dive, but that's cosmetic rather than anything fundamental.

* time-function:
  FIND_TRIP: don't cast a timestamp to a pointer
  dive-time widget: fix incorrect use of timestamp_t
  Fix the incorrect data type for DIVE_DATE accesses
  Use a 64-bit 'timestamp_t' for all timestamps, rather than 'time_t'

1 files changed, 2 insertions, 2 deletions

diff --git a/file.c b/file.c
index ca39c8dd6..943be6f09 100644
--- a/file.c
+++ b/file.c
@@ -99,7 +99,7 @@ static int try_to_open_suunto(const char *filename, struct memblock *mem, GError
 	return success;
 }
 
-static time_t parse_date(const char *date)
+static timestamp_t parse_date(const char *date)
 {
 	int hour, min, sec;
 	struct tm tm;
@@ -171,7 +171,7 @@ static int try_to_open_csv(const char *filename, struct memblock *mem, enum csv_
 	char *p = mem->buffer;
 	char *header[8];
 	int i, time;
-	time_t date;
+	timestamp_t date;
 	struct dive *dive;
 
 	for (i = 0; i < 8; i++) {