From 76c648e7a477ffb2a882ad5ffe523269bd9a3f6a Mon Sep 17 00:00:00 2001
From: patrick <patrick@openbsd.org>
Date: Mon, 4 Feb 2019 16:55:44 +0000
Subject: Import libc++ 7.0.1.

---
 lib/libcxx/src/locale.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/libcxx/src/locale.cpp')

diff --git a/lib/libcxx/src/locale.cpp b/lib/libcxx/src/locale.cpp
index a6cb0e97d12..b9c701137df 100644
--- a/lib/libcxx/src/locale.cpp
+++ b/lib/libcxx/src/locale.cpp
@@ -4240,6 +4240,7 @@ static bool checked_string_to_char_convert(char& dest,
   // FIXME: Work around specific multibyte sequences that we can reasonable
   // translate into a different single byte.
   switch (wout) {
+  case L'\u202F': // narrow non-breaking space
   case L'\u00A0': // non-breaking space
     dest = ' ';
     return true;
@@ -4659,7 +4660,7 @@ static
 string*
 init_am_pm()
 {
-    static string am_pm[24];
+    static string am_pm[2];
     am_pm[0]  = "AM";
     am_pm[1]  = "PM";
     return am_pm;
@@ -4669,7 +4670,7 @@ static
 wstring*
 init_wam_pm()
 {
-    static wstring am_pm[24];
+    static wstring am_pm[2];
     am_pm[0]  = L"AM";
     am_pm[1]  = L"PM";
     return am_pm;
-- 
cgit v1.2.3-59-g8ed1b