No compliation-flag-dependent members in CriticalSection

webrtc/base/criticalsection.h

Index: webrtc/base/criticalsection.h
diff --git a/webrtc/base/criticalsection.h b/webrtc/base/criticalsection.h
index a0f9a6be814355532b4ea2652caca199832c41a1..63d73af586f6453862dac6843bc6048a81bc8b45 100644
--- a/webrtc/base/criticalsection.h
+++ b/webrtc/base/criticalsection.h
@@ -14,8 +14,9 @@
 #include "webrtc/base/atomicops.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/base/thread_annotations.h"
 #include "webrtc/base/platform_thread_types.h"
+#include "webrtc/base/thread_annotations.h"
+#include "webrtc/typedefs.h"
 
 #if defined(WEBRTC_WIN)
 // Include winsock2.h before including <windows.h> to maintain consistency with
@@ -82,8 +83,8 @@ class LOCKABLE CriticalSection {
 #else
   mutable pthread_mutex_t mutex_;
 #endif
-  CS_DEBUG_CODE(mutable PlatformThreadRef thread_);
-  CS_DEBUG_CODE(mutable int recursion_count_);
+  mutable PlatformThreadRef thread_;
+  mutable int recursion_count_;
 #endif
 };
 
@@ -116,7 +117,7 @@ class TryCritScope {
  private:
   const CriticalSection* const cs_;
   const bool locked_;
-  CS_DEBUG_CODE(mutable bool lock_was_called_);
+  mutable bool lock_was_called_;
   RTC_DISALLOW_COPY_AND_ASSIGN(TryCritScope);
 };