From e29996786e13940e189626831f0838a2509c6c81 Mon Sep 17 00:00:00 2001
From: Neale Ferguson <neale@sinenomine.net>
Date: Fri, 3 Jun 2016 13:33:23 -0400
Subject: [PATCH] Use %Y-%m-%d %H:%M:%S for Windows log message header

---
 mono/sgen/sgen-gc.h           | 2 +-
 mono/utils/mono-log-common.c  | 5 +----
 mono/utils/mono-log-windows.c | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/mono/sgen/sgen-gc.h b/mono/sgen/sgen-gc.h
index fb264a4b070..9477efb8cd0 100644
--- a/mono/sgen/sgen-gc.h
+++ b/mono/sgen/sgen-gc.h
@@ -134,7 +134,7 @@ extern guint64 stat_objects_copied_major;
 		struct tm tod;									\
 		time(&t);									\
 		localtime_r(&t, &tod);								\
-		strftime(logTime, sizeof(logTime), "%F %T", &tod);				\
+		strftime(logTime, sizeof(logTime), "%Y-%m-%d %H:%M:%S", &tod);			\
 	} while (0)
 #else
 # define LOG_TIMESTAMP  \
diff --git a/mono/utils/mono-log-common.c b/mono/utils/mono-log-common.c
index a784826ac5c..6565d4fb119 100644
--- a/mono/utils/mono-log-common.c
+++ b/mono/utils/mono-log-common.c
@@ -116,7 +116,7 @@ mono_log_write_logfile(const char *domain, GLogLevelFlags level, mono_bool hdr,
 		time(&t);
 		localtime_r(&t, &tod);
 		pid = getpid();
-		strftime(logTime, sizeof(logTime), "%F %T", &tod);
+		strftime(logTime, sizeof(logTime), "%Y-%m-%d %H:%M:%S", &tod);
 #else
 		struct tm *tod;
 		time(&t);
@@ -129,9 +129,6 @@ mono_log_write_logfile(const char *domain, GLogLevelFlags level, mono_bool hdr,
 	}
 	nLog = sizeof(logMessage) - iLog - 2;
 	iLog = vsnprintf(logMessage+iLog, nLog, format, args);
-#ifdef HOST_WIN32
-	logMessage[iLog++] = '\r';
-#endif
 	logMessage[iLog++] = '\n';
 	logMessage[iLog++] = '\0';
 	fputs(logMessage, logFile);
diff --git a/mono/utils/mono-log-windows.c b/mono/utils/mono-log-windows.c
index ba2f0d38c21..c6ebc9ebe47 100644
--- a/mono/utils/mono-log-windows.c
+++ b/mono/utils/mono-log-windows.c
@@ -101,12 +101,11 @@ mono_log_write_syslog(const char *domain, GLogLevelFlags level, mono_bool hdr, c
 	time(&t);
 	tod = localtime(&t);
 	pid = _getpid();
-	strftime(logTime, sizeof(logTime), "%F %T", tod);
+	strftime(logTime, sizeof(logTime), "%Y-%m-%d %H:%M:%S", tod);
 	iLog = snprintf(logMessage, sizeof(logMessage), "%s level[%c] mono[%d]: ",
 			logTime,mapLogFileLevel(level),pid);
 	nLog = sizeof(logMessage) - iLog - 2;
 	iLog = vsnprintf(logMessage+iLog, nLog, format, args);
-	logMessage[iLog++] = '\r';
 	logMessage[iLog++] = '\n';
 	logMessage[iLog++] = 0;
 	fputs(logMessage, logFile);
-- 
2.25.1