Use static instead of an anonymous namespace.

[oota-llvm.git] / lib / Support / Windows / TimeValue.inc

diff --git a/lib/Support/Windows/TimeValue.inc b/lib/Support/Windows/TimeValue.inc
index 32983be883f3bdaeb7d11fc0ab3de44dab3627dc..6c59024d9c6a8c88f944a48d97b039c86a75756c 100644 (file)
--- a/lib/Support/Windows/TimeValue.inc
+++ b/lib/Support/Windows/TimeValue.inc
@@ -11,11 +11,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Windows.h"
+#include "WindowsSupport.h"
+#include <cctype>
 #include <time.h>
 
-namespace llvm {
-using namespace sys;
+using namespace llvm;
+using namespace llvm::sys;
 
 //===----------------------------------------------------------------------===//
 //=== WARNING: Implementation here must contain only Win32 specific code.
@@ -31,16 +32,28 @@ TimeValue TimeValue::now() {
 }
 
 std::string TimeValue::str() const {
-  struct tm LT;
+  struct tm *LT;
+#ifdef __MINGW32__
+  // Old versions of mingw don't have _localtime64_s. Remove this once we drop support
+  // for them.
+  time_t OurTime = time_t(this->toEpochTime());
+  LT = ::localtime(&OurTime);
+  assert(LT);
+#else
+  struct tm Storage;
   __time64_t OurTime = this->toEpochTime();
-  errno_t Error = ::_localtime64_s(&LT, &OurTime);
+  int Error = ::_localtime64_s(&Storage, &OurTime);
   assert(!Error);
+  LT = &Storage;
+#endif
 
   char Buffer[25];
   // FIXME: the windows version of strftime doesn't support %e
-  strftime(Buffer, 25, "%b %d %H:%M %Y", &LT);
+  strftime(Buffer, 25, "%b %d %H:%M %Y", LT);
+  assert((Buffer[3] == ' ' && isdigit(Buffer[5]) && Buffer[6] == ' ') &&
+         "Unexpected format in strftime()!");
+  // Emulate %e on %d to mute '0'.
+  if (Buffer[4] == '0')
+    Buffer[4] = ' ';
   return std::string(Buffer);
 }
-
-
-}