From 37b904b75ebcb2617a7232f860794d1927957012 Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Tue, 1 Jun 2010 05:11:18 +0000
Subject: [PATCH] Create time_log() to return a timeval so I can implement this
 on windows as well.

Originally committed to SVN as r4391.
---
 aegisub/libaegisub/common/log.cpp            | 3 ++-
 aegisub/libaegisub/include/libaegisub/log.h  | 7 +++++++
 aegisub/libaegisub/include/libaegisub/util.h | 9 +++++++--
 aegisub/libaegisub/unix/util.cpp             | 4 ++++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/aegisub/libaegisub/common/log.cpp b/aegisub/libaegisub/common/log.cpp
index 298cf5527..02179c30d 100644
--- a/aegisub/libaegisub/common/log.cpp
+++ b/aegisub/libaegisub/common/log.cpp
@@ -25,6 +25,7 @@
 
 #include "libaegisub/log.h"
 #include "libaegisub/mutex.h"
+#include "libaegisub/util.h"
 
 namespace agi {
 	namespace log {
@@ -129,7 +130,7 @@ Message::Message(const char *section,
 	buf = new char[len];
 	msg = new std::ostrstream(buf, len);
 	timeval tv;
-	gettimeofday(&tv, (struct timezone *)NULL);
+	util::time_log(tv);
 	sm = new SinkMessage(section, severity, file, func, line, tv);
 }
 
diff --git a/aegisub/libaegisub/include/libaegisub/log.h b/aegisub/libaegisub/include/libaegisub/log.h
index fdacf00ca..183f5a695 100644
--- a/aegisub/libaegisub/include/libaegisub/log.h
+++ b/aegisub/libaegisub/include/libaegisub/log.h
@@ -19,6 +19,13 @@
 /// @ingroup libaegisub
 
 #ifndef LAGI_PRE
+#include <stdio.h>
+#ifdef _WIN32
+#  include <time.h>
+#else
+#  include <sys/time.h>
+#endif // _WIN32
+
 #include <deque>
 #ifdef __DEPRECATED // Dodge GCC warnings
 # undef __DEPRECATED
diff --git a/aegisub/libaegisub/include/libaegisub/util.h b/aegisub/libaegisub/include/libaegisub/util.h
index 61ebb0c53..7a3e460be 100644
--- a/aegisub/libaegisub/include/libaegisub/util.h
+++ b/aegisub/libaegisub/include/libaegisub/util.h
@@ -21,7 +21,12 @@
 #ifndef LAGI_PRE
 #include <string>
 #include <stdio.h>
-#endif
+#ifdef _WIN32
+#  include <time.h>
+#else
+#  include <sys/time.h>
+#endif // _WIN32
+#endif // LAGI_PRE
 
 #include <libaegisub/access.h>
 
@@ -30,7 +35,7 @@ namespace agi {
 
 	const std::string DirName(const std::string& path);
 	void Rename(const std::string& from, const std::string& to);
-
+	void time_log(timeval &tv);
 
 	} // namespace util
 } // namespace agi
diff --git a/aegisub/libaegisub/unix/util.cpp b/aegisub/libaegisub/unix/util.cpp
index 565f9aad3..58845ff59 100644
--- a/aegisub/libaegisub/unix/util.cpp
+++ b/aegisub/libaegisub/unix/util.cpp
@@ -55,5 +55,9 @@ void Rename(const std::string& from, const std::string& to) {
 	rename(from.c_str(), to.c_str());
 }
 
+void time_log(timeval &tv) {
+	gettimeofday(&tv, (struct timezone *)NULL);
+}
+
 	} // namespace io
 } // namespace agi
-- 
GitLab