Marged chris/win32/merge/07-win32-fixes at r210 to trunk

1 files changed, 23 insertions, 2 deletions

diff --git a/lib/common/BoxTimeToText.cpp b/lib/common/BoxTimeToText.cpp
index 94b0d152..297d2100 100755
--- a/lib/common/BoxTimeToText.cpp
+++ b/lib/common/BoxTimeToText.cpp
@@ -27,14 +27,35 @@
 // --------------------------------------------------------------------------
 std::string BoxTimeToISO8601String(box_time_t Time)
 {
+#ifdef WIN32
+	struct tm *time;
+	box_time_t bob = BoxTimeToSeconds(Time);
+
+	__time64_t winTime = bob;
+
+	time = _gmtime64(&winTime);
+	char str[128];	// more than enough space
+	
+	if ( time == NULL )
+	{
+		// ::sprintf(str, "%016I64x ", bob);
+		return std::string("unable to convert time");
+	}
+	
+	sprintf(str, "%04d-%02d-%02dT%02d:%02d:%02d", time->tm_year + 1900,
+		time->tm_mon + 1, time->tm_mday, time->tm_hour, 
+		time->tm_min, time->tm_sec);
+#else // ! WIN32
 	time_t timeInSecs = (time_t)BoxTimeToSeconds(Time);
 	struct tm time;
 	gmtime_r(&timeInSecs, &time);
 	
 	char str[128];	// more than enough space
 	sprintf(str, "%04d-%02d-%02dT%02d:%02d:%02d", time.tm_year + 1900,
-		time.tm_mon + 1, time.tm_mday, time.tm_hour, time.tm_min, time.tm_sec);
-		
+		time.tm_mon + 1, time.tm_mday, time.tm_hour, 
+		time.tm_min, time.tm_sec);
+#endif // WIN32
+	
 	return std::string(str);
 }