Revert of Rename thread annotation macros to have RTC prefix for syncrhonization primitives.

webrtc/rtc_base/criticalsection.h

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 34 matching lines @@
 #define CS_DEBUG_CODE(x) x
 #else  // !CS_DEBUG_CHECKS
 #define CS_DEBUG_CODE(x)
 #endif  // !CS_DEBUG_CHECKS
 
 namespace rtc {
 
 // Locking methods (Enter, TryEnter, Leave)are const to permit protecting
 // members inside a const context without requiring mutable CriticalSections
 // everywhere.
-class RTC_LOCKABLE CriticalSection {
+class LOCKABLE CriticalSection {
  public:
   CriticalSection();
   ~CriticalSection();
 
-  void Enter() const RTC_EXCLUSIVE_LOCK_FUNCTION();
-  bool TryEnter() const RTC_EXCLUSIVE_TRYLOCK_FUNCTION(true);
-  void Leave() const RTC_UNLOCK_FUNCTION();
+  void Enter() const EXCLUSIVE_LOCK_FUNCTION();
+  bool TryEnter() const EXCLUSIVE_TRYLOCK_FUNCTION(true);
+  void Leave() const UNLOCK_FUNCTION();
 
  private:
   // Use only for RTC_DCHECKing.
   bool CurrentThreadIsOwner() const;
 
 #if defined(WEBRTC_WIN)
   mutable CRITICAL_SECTION crit_;
 #elif defined(WEBRTC_POSIX)
 # if defined(WEBRTC_MAC) && !USE_NATIVE_MUTEX_ON_MAC
   // Number of times the lock has been locked + number of threads waiting.
@@ skipping 11 matching lines @@
   mutable pthread_mutex_t mutex_;
 # endif
   mutable PlatformThreadRef thread_;  // Only used by RTC_DCHECKs.
   mutable int recursion_count_;       // Only used by RTC_DCHECKs.
 #else  // !defined(WEBRTC_WIN) && !defined(WEBRTC_POSIX)
 # error Unsupported platform.
 #endif
 };
 
 // CritScope, for serializing execution through a scope.
-class RTC_SCOPED_LOCKABLE CritScope {
+class SCOPED_LOCKABLE CritScope {
  public:
-  explicit CritScope(const CriticalSection* cs) RTC_EXCLUSIVE_LOCK_FUNCTION(cs);
-  ~CritScope() RTC_UNLOCK_FUNCTION();
-
+  explicit CritScope(const CriticalSection* cs) EXCLUSIVE_LOCK_FUNCTION(cs);
+  ~CritScope() UNLOCK_FUNCTION();
  private:
   const CriticalSection* const cs_;
   RTC_DISALLOW_COPY_AND_ASSIGN(CritScope);
 };
 
 // Tries to lock a critical section on construction via
 // CriticalSection::TryEnter, and unlocks on destruction if the
 // lock was taken. Never blocks.
 //
 // IMPORTANT: Unlike CritScope, the lock may not be owned by this thread in
@@ skipping 12 matching lines @@
 #endif
  private:
   const CriticalSection* const cs_;
   const bool locked_;
   mutable bool lock_was_called_;  // Only used by RTC_DCHECKs.
   RTC_DISALLOW_COPY_AND_ASSIGN(TryCritScope);
 };
 
 // A POD lock used to protect global variables. Do NOT use for other purposes.
 // No custom constructor or private data member should be added.
-class RTC_LOCKABLE GlobalLockPod {
+class LOCKABLE GlobalLockPod {
  public:
-  void Lock() RTC_EXCLUSIVE_LOCK_FUNCTION();
+  void Lock() EXCLUSIVE_LOCK_FUNCTION();
 
-  void Unlock() RTC_UNLOCK_FUNCTION();
+  void Unlock() UNLOCK_FUNCTION();
 
   volatile int lock_acquired;
 };
 
 class GlobalLock : public GlobalLockPod {
  public:
   GlobalLock();
 };
 
 // GlobalLockScope, for serializing execution through a scope.
-class RTC_SCOPED_LOCKABLE GlobalLockScope {
+class SCOPED_LOCKABLE GlobalLockScope {
  public:
-  explicit GlobalLockScope(GlobalLockPod* lock)
-      RTC_EXCLUSIVE_LOCK_FUNCTION(lock);
-  ~GlobalLockScope() RTC_UNLOCK_FUNCTION();
-
+  explicit GlobalLockScope(GlobalLockPod* lock) EXCLUSIVE_LOCK_FUNCTION(lock);
+  ~GlobalLockScope() UNLOCK_FUNCTION();
  private:
   GlobalLockPod* const lock_;
   RTC_DISALLOW_COPY_AND_ASSIGN(GlobalLockScope);
 };
 
 } // namespace rtc
 
 #endif // WEBRTC_RTC_BASE_CRITICALSECTION_H_