@@ -87,14 +87,14 @@
 
 #if defined(OF_WINDOWS) || defined(OF_AMIGAOS)
 typedef struct {
 	of_offset_t st_size;
 	unsigned int st_mode;
-	of_time_interval_t st_atime, st_mtime, st_ctime;
+	OFTimeInterval st_atime, st_mtime, st_ctime;
 # ifdef OF_WINDOWS
 #  define HAVE_STRUCT_STAT_ST_BIRTHTIME
-	of_time_interval_t st_birthtime;
+	OFTimeInterval st_birthtime;
 	DWORD fileAttributes;
 # endif
 } of_stat_t;
 #elif defined(HAVE_STAT64)
 typedef struct stat64 of_stat_t;
@@ -132,11 +132,11 @@
 static WINAPI BOOLEAN (*func_CreateHardLinkW)(LPCWSTR, LPCWSTR,
     LPSECURITY_ATTRIBUTES);
 #endif
 
 #ifdef OF_WINDOWS
-static of_time_interval_t
+static OFTimeInterval
 filetimeToTimeInterval(const FILETIME *filetime)
 {
 	return (double)((int64_t)filetime->dwHighDateTime << 32 |
 	    filetime->dwLowDateTime) / 10000000.0 - 11644473600.0;
 }
@@ -260,11 +260,11 @@
 # ifdef OF_AMIGAOS4
 	struct ExamineData *ed;
 # else
 	struct FileInfoBlock fib;
 # endif
-	of_time_interval_t timeInterval;
+	OFTimeInterval timeInterval;
 	struct Locale *locale;
 	struct DateStamp *date;
 
 	if ((lock = Lock([path cStringWithEncoding: [OFLocale encoding]],
 	    SHARED_LOCK)) == 0)
@@ -313,11 +313,11 @@
 # else
 	date = &fib.fib_Date;
 # endif
 	timeInterval += date->ds_Days * 86400.0;
 	timeInterval += date->ds_Minute * 60.0;
-	timeInterval += date->ds_Tick / (of_time_interval_t)TICKS_PER_SECOND;
+	timeInterval += date->ds_Tick / (OFTimeInterval)TICKS_PER_SECOND;
 
 	buffer->st_atime = buffer->st_mtime = buffer->st_ctime = timeInterval;
 
 # ifdef OF_AMIGAOS4
 	FreeDosObject(DOS_EXAMINEDATA, ed);
@@ -701,11 +701,11 @@
 			     failedAttribute: attributeKey
 				       errNo: errno];
 	}
 #elif defined(OF_AMIGAOS)
 	/* AmigaOS does not support access time. */
-	of_time_interval_t modificationTime =
+	OFTimeInterval modificationTime =
 	    modificationDate.timeIntervalSince1970;
 	struct Locale *locale;
 	struct DateStamp date;
 
 	modificationTime -= 252460800;	/* 1978-01-01 */
@@ -737,13 +737,12 @@
 		    exceptionWithURL: URL
 			  attributes: attributes
 		     failedAttribute: attributeKey
 			       errNo: retrieveError()];
 #else
-	of_time_interval_t lastAccessTime =
-	    lastAccessDate.timeIntervalSince1970;
-	of_time_interval_t modificationTime =
+	OFTimeInterval lastAccessTime = lastAccessDate.timeIntervalSince1970;
+	OFTimeInterval modificationTime =
 	    modificationDate.timeIntervalSince1970;
 	struct timeval times[2] = {
 		{
 			.tv_sec = (time_t)lastAccessTime,
 			.tv_usec =