[libcxx-commits] [libcxx] 1a31493 - [libc++] Move _LIBCPP_HAS_COND_CLOCKWAIT into condition_variable.h (#222904)

[via libcxx-commits]

Author: Nikolas Klauser
Date: 2026-09-14T12:22:34+02:00
New Revision: 1a31493a5cc8c05db3473ffa35f6c1d1289fcd22

URL: https://github.com/llvm/llvm-project/commit/1a31493a5cc8c05db3473ffa35f6c1d1289fcd22
DIFF: https://github.com/llvm/llvm-project/commit/1a31493a5cc8c05db3473ffa35f6c1d1289fcd22.diff

LOG: [libc++] Move _LIBCPP_HAS_COND_CLOCKWAIT into condition_variable.h (#222904)

`_LIBCPP_HAS_COND_CLOCKWAIT` is only used inside
`<__condition_variable/condition_variable.h>`, so we might as well move
it there.

Added: 
    

Modified: 
    libcxx/include/__condition_variable/condition_variable.h
    libcxx/include/__config

Removed: 
    


################################################################################
diff  --git a/libcxx/include/__condition_variable/condition_variable.h b/libcxx/include/__condition_variable/condition_variable.h
index a29b66152981d..f95de5391918f 100644
--- a/libcxx/include/__condition_variable/condition_variable.h
+++ b/libcxx/include/__condition_variable/condition_variable.h
@@ -36,6 +36,14 @@ _LIBCPP_PUSH_MACROS
 _LIBCPP_BEGIN_NAMESPACE_STD
 _LIBCPP_BEGIN_EXPLICIT_ABI_ANNOTATIONS
 
+#  if !_LIBCPP_HAS_THREAD_API_PTHREAD
+#    define _LIBCPP_HAS_COND_CLOCKWAIT 0
+#  elif (defined(__ANDROID__) && __ANDROID_API__ >= 30) || _LIBCPP_GLIBC_PREREQ(2, 30)
+#    define _LIBCPP_HAS_COND_CLOCKWAIT 1
+#  else
+#    define _LIBCPP_HAS_COND_CLOCKWAIT 0
+#  endif
+
 // enum class cv_status
 _LIBCPP_DECLARE_STRONG_ENUM(cv_status){no_timeout, timeout};
 _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(cv_status)

diff  --git a/libcxx/include/__config b/libcxx/include/__config
index 5704c21199c29..ade43d42dc283 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -210,14 +210,6 @@ typedef __char32_t char32_t;
 #    endif // _LIBCPP_HAS_THREAD_API
 #  endif   // _LIBCPP_HAS_THREADS
 
-#  if !_LIBCPP_HAS_THREAD_API_PTHREAD
-#    define _LIBCPP_HAS_COND_CLOCKWAIT 0
-#  elif (defined(__ANDROID__) && __ANDROID_API__ >= 30) || _LIBCPP_GLIBC_PREREQ(2, 30)
-#    define _LIBCPP_HAS_COND_CLOCKWAIT 1
-#  else
-#    define _LIBCPP_HAS_COND_CLOCKWAIT 0
-#  endif
-
 #  if !_LIBCPP_HAS_THREADS && _LIBCPP_HAS_THREAD_API_PTHREAD
 #    error _LIBCPP_HAS_THREAD_API_PTHREAD may only be true when _LIBCPP_HAS_THREADS is true.
 #  endif