gthr,libcxx,c11: Revert previous changes due to build errors

lhmouse · Jan 17, 2024 · 8b9183d · 8b9183d
1 parent db34576
commit 8b9183d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/mcfgthread/c11.h b/mcfgthread/c11.h
@@ -404,7 +404,6 @@ __MCF_c11_call_once(once_flag* __once, __MCF_once_callback* __init_proc)
     __try
 #else
     _MCF_once* __once_g __attribute__((__cleanup__(__MCF_gthr_unonce))) = NULL;
-    if(0); else
 #endif
     {
       if(_MCF_once_wait(__once, NULL) == 0)
@@ -415,9 +414,9 @@ __MCF_c11_call_once(once_flag* __once, __MCF_once_callback* __init_proc)
       __once_g = NULL;
       _MCF_once_release(__once);
     }
- #ifdef _MSC_VER
+#ifdef _MSC_VER
     __finally { __MCF_gthr_unonce(&__once_g);  }
- #endif
+#endif
   }
 
 __MCF_C11_INLINE

diff --git a/mcfgthread/gthr.h b/mcfgthread/gthr.h
@@ -350,7 +350,6 @@ __MCF_gthr_once(__gthread_once_t* __once, __MCF_once_callback* __init_proc)
     __try
 #else
     _MCF_once* __once_g __attribute__((__cleanup__(__MCF_gthr_unonce))) = NULL;
-    if(0); else
 #endif
     {
       if(_MCF_once_wait(__once, NULL) == 0)
@@ -362,9 +361,9 @@ __MCF_gthr_once(__gthread_once_t* __once, __MCF_once_callback* __init_proc)
       _MCF_once_release(__once);
       return 0;
     }
- #ifdef _MSC_VER
+#ifdef _MSC_VER
     __finally { __MCF_gthr_unonce(&__once_g);  }
- #endif
+#endif
   }
 
 __MCF_GTHR_INLINE

diff --git a/mcfgthread/libcxx.h b/mcfgthread/libcxx.h
@@ -346,7 +346,6 @@ __MCF_libcxx_execute_once(__libcpp_exec_once_flag* __once, __MCF_once_callback*
     __try
 #else
     _MCF_once* __once_g __attribute__((__cleanup__(__MCF_gthr_unonce))) = NULL;
-    if(0); else
 #endif
     {
       if(_MCF_once_wait(__once, NULL) == 0)
@@ -358,9 +357,9 @@ __MCF_libcxx_execute_once(__libcpp_exec_once_flag* __once, __MCF_once_callback*
       _MCF_once_release(__once);
       return 0;
     }
- #ifdef _MSC_VER
+#ifdef _MSC_VER
     __finally { __MCF_gthr_unonce(&__once_g);  }
- #endif
+#endif
   }
 
 __MCF_LIBCXX_INLINE