libcxx: Use plain namespace std without versioning

(cherry picked from commit ebb97ba) Signed-off-by: LIU Hao <lh_mouse@126.com>
lhmouse · Nov 17, 2024 · 03b35a4 · 03b35a4
1 parent 1a0a790
commit 03b35a4
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/mcfgthread/libcxx.h b/mcfgthread/libcxx.h
@@ -12,10 +12,7 @@
 #include "gthr_aux.h"
 #include <errno.h>
 
-#ifdef _LIBCPP_BEGIN_NAMESPACE_STD
-_LIBCPP_BEGIN_NAMESPACE_STD
-#endif  /* inside libc++  */
-__MCF_CXX(extern "C" {)
+__MCF_CXX(namespace std { extern "C" {)
 #ifndef __MCF_LIBCXX_IMPORT
 #  define __MCF_LIBCXX_IMPORT
 #  define __MCF_LIBCXX_INLINE  __MCF_GNU_INLINE
@@ -634,8 +631,5 @@ __MCF_libcxx_thread_yield(void) __MCF_noexcept
     _MCF_yield();
   }
 
-__MCF_CXX(})  /* extern "C"  */
-#ifdef _LIBCPP_END_NAMESPACE_STD
-_LIBCPP_END_NAMESPACE_STD
-#endif  /* inside libc++  */
+__MCF_CXX(} })  /* extern "C"; namespace std  */
 #endif  /* __MCFGTHREAD_LIBCXX_  */