From 8dfec1ac7de8b1eddd32f9f81a558ebf73519c04 Mon Sep 17 00:00:00 2001
From: Alexis Hunt <alercah@gmail.com>
Date: Tue, 12 Jul 2011 00:55:04 +0000
Subject: [PATCH] Make sure that __time_put constructors properly on non-Apple
 platforms.

llvm-svn: 134947
---
 libcxx/include/locale | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libcxx/include/locale b/libcxx/include/locale
index 778d6c6f9021..f1ef8c3feeda 100644
--- a/libcxx/include/locale
+++ b/libcxx/include/locale
@@ -2516,7 +2516,11 @@ class __time_put
 {
     locale_t __loc_;
 protected:
+#ifdef _LIBCPP_STABLE_APPLE_ABI
     _LIBCPP_ALWAYS_INLINE __time_put() : __loc_(0) {}
+#else   // _LIBCPP_STABLE_APPLE_ABI
+    _LIBCPP_ALWAYS_INLINE __time_put() : __loc_(__cloc()) {}
+#endif  // _LIBCPP_STABLE_APPLE_ABI
     __time_put(const char* __nm);
     __time_put(const string& __nm);
     ~__time_put();