From bbe2b9dbc4e015714c3abfcf1939d1bc992ad08a Mon Sep 17 00:00:00 2001
From: Alexis Hunt <alercah@gmail.com>
Date: Fri, 15 Jul 2011 05:44:47 +0000
Subject: [PATCH] Fix wchar tests by not assuming that tm is complete and by
 using the proper va_list time on non-darwin platforms.

llvm-svn: 135247
---
 libcxx/test/depr/depr.c.headers/wchar_h.pass.cpp | 8 ++++++--
 libcxx/test/strings/c.strings/cwchar.pass.cpp    | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/libcxx/test/depr/depr.c.headers/wchar_h.pass.cpp b/libcxx/test/depr/depr.c.headers/wchar_h.pass.cpp
index f861827861e3..68bea49cfe03 100644
--- a/libcxx/test/depr/depr.c.headers/wchar_h.pass.cpp
+++ b/libcxx/test/depr/depr.c.headers/wchar_h.pass.cpp
@@ -32,10 +32,14 @@ int main()
 {
     mbstate_t mb = {0};
     size_t s = 0;
-    tm tm = {0};
+    tm *tm = 0;
     wint_t w = 0;
     ::FILE* fp = 0;
+#ifdef __APPLE__
     __darwin_va_list va;
+#else
+    __builtin_va_list va;
+#endif
     char* ns = 0;
     wchar_t* ws = 0;
     static_assert((std::is_same<decltype(fwprintf(fp, L"")), int>::value), "");
@@ -88,7 +92,7 @@ int main()
     static_assert((std::is_same<decltype(wmemcpy(ws, L"", s)), wchar_t*>::value), "");
     static_assert((std::is_same<decltype(wmemmove(ws, L"", s)), wchar_t*>::value), "");
     static_assert((std::is_same<decltype(wmemset(ws, L' ', s)), wchar_t*>::value), "");
-    static_assert((std::is_same<decltype(wcsftime(ws, s, L"", &tm)), size_t>::value), "");
+    static_assert((std::is_same<decltype(wcsftime(ws, s, L"", tm)), size_t>::value), "");
     static_assert((std::is_same<decltype(btowc(0)), wint_t>::value), "");
     static_assert((std::is_same<decltype(wctob(w)), int>::value), "");
     static_assert((std::is_same<decltype(mbsinit(&mb)), int>::value), "");
diff --git a/libcxx/test/strings/c.strings/cwchar.pass.cpp b/libcxx/test/strings/c.strings/cwchar.pass.cpp
index 2a0029e19fde..d0481b706105 100644
--- a/libcxx/test/strings/c.strings/cwchar.pass.cpp
+++ b/libcxx/test/strings/c.strings/cwchar.pass.cpp
@@ -32,10 +32,14 @@ int main()
 {
     std::mbstate_t mb = {0};
     std::size_t s = 0;
-    std::tm tm = {0};
+    std::tm *tm = 0;
     std::wint_t w = 0;
     ::FILE* fp = 0;
+#ifdef __APPLE__
     __darwin_va_list va;
+#else
+    __builtin_va_list va;
+#endif
     char* ns = 0;
     wchar_t* ws = 0;
     static_assert((std::is_same<decltype(std::fwprintf(fp, L"")), int>::value), "");
@@ -93,7 +97,7 @@ int main()
     static_assert((std::is_same<decltype(std::wmemcpy(ws, L"", s)), wchar_t*>::value), "");
     static_assert((std::is_same<decltype(std::wmemmove(ws, L"", s)), wchar_t*>::value), "");
     static_assert((std::is_same<decltype(std::wmemset(ws, L' ', s)), wchar_t*>::value), "");
-    static_assert((std::is_same<decltype(std::wcsftime(ws, s, L"", &tm)), std::size_t>::value), "");
+    static_assert((std::is_same<decltype(std::wcsftime(ws, s, L"", tm)), std::size_t>::value), "");
     static_assert((std::is_same<decltype(std::btowc(0)), wint_t>::value), "");
     static_assert((std::is_same<decltype(std::wctob(w)), int>::value), "");
     static_assert((std::is_same<decltype(std::mbsinit(&mb)), int>::value), "");