Namespace #defines that weren't SWIFT_-prefixed.

NFC

Author: jckarter

include/swift/Runtime/Mutex.h

@@ -392,7 +392,7 @@ class StaticConditionVariable {
   StaticConditionVariable &operator=(StaticConditionVariable &&) = delete;
 
 public:
-#if CONDITION_SUPPORTS_CONSTEXPR
+#if SWIFT_CONDITION_SUPPORTS_CONSTEXPR
   constexpr
 #endif
       StaticConditionVariable()
@@ -420,7 +420,7 @@ class StaticMutex {
   StaticMutex &operator=(StaticMutex &&) = delete;
 
 public:
-#if MUTEX_SUPPORTS_CONSTEXPR
+#if SWIFT_MUTEX_SUPPORTS_CONSTEXPR
   constexpr
 #endif
       StaticMutex()
@@ -495,7 +495,7 @@ class StaticReadWriteLock {
   StaticReadWriteLock &operator=(StaticReadWriteLock &&) = delete;
 
 public:
-#if READWRITELOCK_SUPPORTS_CONSTEXPR
+#if SWIFT_READWRITELOCK_SUPPORTS_CONSTEXPR
   constexpr
 #endif
       StaticReadWriteLock()
@@ -560,7 +560,7 @@ class StaticUnsafeMutex {
   StaticUnsafeMutex &operator=(StaticUnsafeMutex &&) = delete;
 
 public:
-#if MUTEX_SUPPORTS_CONSTEXPR
+#if SWIFT_MUTEX_SUPPORTS_CONSTEXPR
   constexpr
 #endif
       StaticUnsafeMutex()
@@ -714,7 +714,7 @@ typedef ScopedRWLockT<ReadWriteLock, false, true> ScopedWriteUnlock;
 typedef ScopedRWLockT<StaticReadWriteLock, false, true> StaticScopedWriteUnlock;
 
 // Enforce literal requirements for static variants.
-#if MUTEX_SUPPORTS_CONSTEXPR
+#if SWIFT_MUTEX_SUPPORTS_CONSTEXPR
 static_assert(std::is_literal_type<StaticMutex>::value,
               "StaticMutex must be literal type");
 static_assert(std::is_literal_type<StaticUnsafeMutex>::value,
@@ -724,15 +724,15 @@ static_assert(std::is_literal_type<StaticUnsafeMutex>::value,
 // you will possibly see global-constructors warnings
 #endif
 
-#if CONDITION_SUPPORTS_CONSTEXPR
+#if SWIFT_CONDITION_SUPPORTS_CONSTEXPR
 static_assert(std::is_literal_type<StaticConditionVariable>::value,
               "StaticConditionVariable must be literal type");
 #else
 // Your platform doesn't currently support statically allocated ConditionVar
 // you will possibly see global-constructors warnings
 #endif
 
-#if READWRITELOCK_SUPPORTS_CONSTEXPR
+#if SWIFT_READWRITELOCK_SUPPORTS_CONSTEXPR
 static_assert(std::is_literal_type<StaticReadWriteLock>::value,
               "StaticReadWriteLock must be literal type");
 #else

include/swift/Runtime/MutexPThread.h

@@ -32,21 +32,21 @@ typedef pthread_rwlock_t ReadWriteLockHandle;
 // results in a reinterpret_cast which violates constexpr. Similarly, Android's
 // pthread implementation makes use of volatile attributes that prevent it from
 // being marked as constexpr.
-#define CONDITION_SUPPORTS_CONSTEXPR 0
-#define MUTEX_SUPPORTS_CONSTEXPR 0
-#define READWRITELOCK_SUPPORTS_CONSTEXPR 0
+#define SWIFT_CONDITION_SUPPORTS_CONSTEXPR 0
+#define SWIFT_MUTEX_SUPPORTS_CONSTEXPR 0
+#define SWIFT_READWRITELOCK_SUPPORTS_CONSTEXPR 0
 #else
-#define CONDITION_SUPPORTS_CONSTEXPR 1
-#define MUTEX_SUPPORTS_CONSTEXPR 1
-#define READWRITELOCK_SUPPORTS_CONSTEXPR 1
+#define SWIFT_CONDITION_SUPPORTS_CONSTEXPR 1
+#define SWIFT_MUTEX_SUPPORTS_CONSTEXPR 1
+#define SWIFT_READWRITELOCK_SUPPORTS_CONSTEXPR 1
 #endif
 
 /// PThread low-level implementation that supports ConditionVariable
 /// found in Mutex.h
 ///
 /// See ConditionVariable
 struct ConditionPlatformHelper {
-#if CONDITION_SUPPORTS_CONSTEXPR
+#if SWIFT_CONDITION_SUPPORTS_CONSTEXPR
   static constexpr
 #else
   static
@@ -67,7 +67,7 @@ struct ConditionPlatformHelper {
 ///
 /// See Mutex
 struct MutexPlatformHelper {
-#if MUTEX_SUPPORTS_CONSTEXPR
+#if SWIFT_MUTEX_SUPPORTS_CONSTEXPR
   static constexpr
 #else
   static
@@ -96,7 +96,7 @@ struct MutexPlatformHelper {
 ///
 /// See ReadWriteLock
 struct ReadWriteLockPlatformHelper {
-#if READWRITELOCK_SUPPORTS_CONSTEXPR
+#if SWIFT_READWRITELOCK_SUPPORTS_CONSTEXPR
   static constexpr
 #else
   static

include/swift/Runtime/MutexWin32.h

@@ -28,9 +28,9 @@ typedef CONDITION_VARIABLE ConditionHandle;
 typedef SRWLOCK MutexHandle;
 typedef SRWLOCK ReadWriteLockHandle;
 
-#define CONDITION_SUPPORTS_CONSTEXPR 1
-#define MUTEX_SUPPORTS_CONSTEXPR 1
-#define READWRITELOCK_SUPPORTS_CONSTEXPR 1
+#define SWIFT_CONDITION_SUPPORTS_CONSTEXPR 1
+#define SWIFT_MUTEX_SUPPORTS_CONSTEXPR 1
+#define SWIFT_READWRITELOCK_SUPPORTS_CONSTEXPR 1
 
 struct ConditionPlatformHelper {
   static constexpr ConditionHandle staticInit() {