c11,gthr,gthr_libobjc,libcxx: Remove constexpr from aliased functions

lhmouse · Nov 12, 2024 · e49d4e7 · e49d4e7
1 parent 9b9ee48
commit e49d4e7
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/mcfgthread/c11.h b/mcfgthread/c11.h
@@ -241,7 +241,7 @@ __MCF_FNA(__MCF_c11_thrd_detach, thrd_detach);
 #endif
 
 /* 7.26.5.4 The thrd_equal function  */
-__MCF_C11_IMPORT __MCF_FN_PURE __MCF_CXX11(constexpr)
+__MCF_C11_IMPORT __MCF_FN_PURE
 int
 __MCF_c11_thrd_equal(thrd_t __t1, thrd_t __t2) __MCF_noexcept;
 
@@ -551,7 +551,7 @@ __MCF_c11_thrd_detach(thrd_t __thrd) __MCF_noexcept
     return thrd_success;
   }
 
-__MCF_C11_INLINE __MCF_CXX11(constexpr)
+__MCF_C11_INLINE
 int
 __MCF_c11_thrd_equal(thrd_t __t1, thrd_t __t2) __MCF_noexcept
   {

diff --git a/mcfgthread/gthr.h b/mcfgthread/gthr.h
@@ -45,7 +45,7 @@ typedef __MCF_gthr_rc_mutex __gthread_recursive_mutex_t;
 /* Informs the runtime that threading support is active.
  * Windows creates new threads for console control handlers, so threading
  * cannot be disabled.  */
-__MCF_GTHR_INLINE __MCF_FN_CONST __MCF_CXX11(constexpr)
+__MCF_GTHR_INLINE __MCF_FN_CONST
 int
 __MCF_gthr_active_p(void) __MCF_noexcept;
 
@@ -344,7 +344,7 @@ __MCF_FNA(__MCF_gthr_self, __gthread_self);
 #endif
 
 /* Checks whether two thread IDs compare equal, like `pthread_equal()`.  */
-__MCF_GTHR_INLINE __MCF_FN_PURE __MCF_CXX11(constexpr)
+__MCF_GTHR_INLINE __MCF_FN_PURE
 int
 __MCF_gthr_equal(__gthread_t __t1, __gthread_t __t2) __MCF_noexcept;
 
@@ -368,7 +368,7 @@ __MCF_FNA(__MCF_gthr_yield, __gthread_yield);
  * matches the disposition of non-inline functions. Note that however, unlike C++
  * inline functions, they have to have consistent inline specifiers throughout
  * this file.  */
-__MCF_GTHR_INLINE __MCF_CXX11(constexpr)
+__MCF_GTHR_INLINE
 int
 __MCF_gthr_active_p(void) __MCF_noexcept
   {
@@ -666,7 +666,7 @@ __MCF_gthr_self(void) __MCF_noexcept
     return _MCF_thread_self();
   }
 
-__MCF_GTHR_INLINE __MCF_CXX11(constexpr)
+__MCF_GTHR_INLINE
 int
 __MCF_gthr_equal(__gthread_t __t1, __gthread_t __t2) __MCF_noexcept
   {

diff --git a/mcfgthread/gthr_libobjc.h b/mcfgthread/gthr_libobjc.h
@@ -24,7 +24,7 @@ __MCF_CXX(extern "C" {)
 typedef void* objc_thread_t;
 
 /* Initialize the threads subsystem.  */
-__MCF_GTHR_LIBOBJC_INLINE __MCF_CXX11(constexpr)
+__MCF_GTHR_LIBOBJC_INLINE
 int
 __MCF_gthr_objc_init_thread_system(void) __MCF_noexcept;
 
@@ -34,7 +34,7 @@ __MCF_FNA(__MCF_gthr_objc_init_thread_system, __gthread_objc_init_thread_system)
 #endif
 
 /* Close the threads subsystem.  */
-__MCF_GTHR_LIBOBJC_INLINE __MCF_CXX11(constexpr)
+__MCF_GTHR_LIBOBJC_INLINE
 int
 __MCF_gthr_objc_close_thread_system(void) __MCF_noexcept;
 
@@ -236,14 +236,14 @@ __MCF_FNA(__MCF_gthr_objc_thread_set_data, __gthread_objc_thread_set_data);
  * matches the disposition of non-inline functions. Note that however, unlike C++
  * inline functions, they have to have consistent inline specifiers throughout
  * this file.  */
-__MCF_GTHR_LIBOBJC_INLINE __MCF_CXX11(constexpr)
+__MCF_GTHR_LIBOBJC_INLINE
 int
 __MCF_gthr_objc_init_thread_system(void) __MCF_noexcept
   {
     return 0;
   }
 
-__MCF_GTHR_LIBOBJC_INLINE __MCF_CXX11(constexpr)
+__MCF_GTHR_LIBOBJC_INLINE
 int
 __MCF_gthr_objc_close_thread_system(void) __MCF_noexcept
   {

diff --git a/mcfgthread/libcxx.h b/mcfgthread/libcxx.h
@@ -291,7 +291,7 @@ __MCF_FNA(__MCF_libcxx_thread_detach, __libcpp_thread_detach);
 #endif
 
 /* Checks whether a thread object is null.  */
-__MCF_LIBCXX_INLINE __MCF_FN_PURE __MCF_CXX11(constexpr)
+__MCF_LIBCXX_INLINE __MCF_FN_PURE
 bool
 __MCF_libcxx_thread_isnull(const __libcpp_thread_t* __thrdp) __MCF_noexcept;
 
@@ -313,7 +313,7 @@ __MCF_FNA(__MCF_libcxx_thread_get_current_id, __libcpp_thread_get_current_id);
 #endif
 
 /* Gets the ID of another thread.  */
-__MCF_LIBCXX_INLINE __MCF_FN_PURE __MCF_CXX11(constexpr)
+__MCF_LIBCXX_INLINE __MCF_FN_PURE
 __libcpp_thread_id
 __MCF_libcxx_thread_get_id(const __libcpp_thread_t* __thrdp) __MCF_noexcept;
 
@@ -323,7 +323,7 @@ __MCF_FNA(__MCF_libcxx_thread_get_id, __libcpp_thread_get_id);
 #endif
 
 /* Checks whether two thread IDs compare equal, like `pthread_equal()`.  */
-__MCF_LIBCXX_INLINE __MCF_FN_PURE __MCF_CXX11(constexpr)
+__MCF_LIBCXX_INLINE __MCF_FN_PURE
 bool
 __MCF_libcxx_thread_id_equal(__libcpp_thread_id __t1, __libcpp_thread_id __t2) __MCF_noexcept;
 
@@ -333,7 +333,7 @@ __MCF_FNA(__MCF_libcxx_thread_id_equal, __libcpp_thread_id_equal);
 #endif
 
 /* Checks whether two thread IDs compare less, for standard containers.  */
-__MCF_LIBCXX_INLINE __MCF_FN_PURE __MCF_CXX11(constexpr)
+__MCF_LIBCXX_INLINE __MCF_FN_PURE
 bool
 __MCF_libcxx_thread_id_less(__libcpp_thread_id __t1, __libcpp_thread_id __t2) __MCF_noexcept;
 
@@ -625,7 +625,7 @@ __MCF_libcxx_thread_detach(const __libcpp_thread_t* __thrdp) __MCF_noexcept
     return 0;
   }
 
-__MCF_LIBCXX_INLINE __MCF_CXX11(constexpr)
+__MCF_LIBCXX_INLINE
 bool
 __MCF_libcxx_thread_isnull(const __libcpp_thread_t* __thrdp) __MCF_noexcept
   {
@@ -639,21 +639,21 @@ __MCF_libcxx_thread_get_current_id(void) __MCF_noexcept
     return _MCF_thread_self_tid();
   }
 
-__MCF_LIBCXX_INLINE __MCF_CXX11(constexpr)
+__MCF_LIBCXX_INLINE
 __libcpp_thread_id
 __MCF_libcxx_thread_get_id(const __libcpp_thread_t* __thrdp) __MCF_noexcept
   {
     return _MCF_thread_get_tid(*__thrdp);
   }
 
-__MCF_LIBCXX_INLINE __MCF_CXX11(constexpr)
+__MCF_LIBCXX_INLINE
 bool
 __MCF_libcxx_thread_id_equal(__libcpp_thread_id __t1, __libcpp_thread_id __t2) __MCF_noexcept
   {
     return __t1 == __t2;
   }
 
-__MCF_LIBCXX_INLINE __MCF_CXX11(constexpr)
+__MCF_LIBCXX_INLINE
 bool
 __MCF_libcxx_thread_id_less(__libcpp_thread_id __t1, __libcpp_thread_id __t2) __MCF_noexcept
   {