Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(145)

Side by Side Diff: webrtc/rtc_base/criticalsection.h

Issue 2962303003: Revert "Update includes for webrtc/{base => rtc_base} rename (3/3)" (Closed)
Patch Set: Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/rtc_base/crc32_unittest.cc ('k') | webrtc/rtc_base/criticalsection.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_RTC_BASE_CRITICALSECTION_H_ 11 #ifndef WEBRTC_RTC_BASE_CRITICALSECTION_H_
12 #define WEBRTC_RTC_BASE_CRITICALSECTION_H_ 12 #define WEBRTC_RTC_BASE_CRITICALSECTION_H_
13 13
14 #include "webrtc/rtc_base/atomicops.h" 14 #include "webrtc/base/atomicops.h"
15 #include "webrtc/rtc_base/checks.h" 15 #include "webrtc/base/checks.h"
16 #include "webrtc/rtc_base/constructormagic.h" 16 #include "webrtc/base/constructormagic.h"
17 #include "webrtc/rtc_base/platform_thread_types.h" 17 #include "webrtc/base/platform_thread_types.h"
18 #include "webrtc/rtc_base/thread_annotations.h" 18 #include "webrtc/base/thread_annotations.h"
19 #include "webrtc/typedefs.h" 19 #include "webrtc/typedefs.h"
20 20
21 #if defined(WEBRTC_WIN) 21 #if defined(WEBRTC_WIN)
22 // Include winsock2.h before including <windows.h> to maintain consistency with 22 // Include winsock2.h before including <windows.h> to maintain consistency with
23 // win32.h. We can't include win32.h directly here since it pulls in 23 // win32.h. We can't include win32.h directly here since it pulls in
24 // headers such as basictypes.h which causes problems in Chromium where webrtc 24 // headers such as basictypes.h which causes problems in Chromium where webrtc
25 // exists as two separate projects, webrtc and libjingle. 25 // exists as two separate projects, webrtc and libjingle.
26 #include <winsock2.h> 26 #include <winsock2.h>
27 #include <windows.h> 27 #include <windows.h>
28 #include <sal.h> // must come after windows headers. 28 #include <sal.h> // must come after windows headers.
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 explicit GlobalLockScope(GlobalLockPod* lock) EXCLUSIVE_LOCK_FUNCTION(lock); 147 explicit GlobalLockScope(GlobalLockPod* lock) EXCLUSIVE_LOCK_FUNCTION(lock);
148 ~GlobalLockScope() UNLOCK_FUNCTION(); 148 ~GlobalLockScope() UNLOCK_FUNCTION();
149 private: 149 private:
150 GlobalLockPod* const lock_; 150 GlobalLockPod* const lock_;
151 RTC_DISALLOW_COPY_AND_ASSIGN(GlobalLockScope); 151 RTC_DISALLOW_COPY_AND_ASSIGN(GlobalLockScope);
152 }; 152 };
153 153
154 } // namespace rtc 154 } // namespace rtc
155 155
156 #endif // WEBRTC_RTC_BASE_CRITICALSECTION_H_ 156 #endif // WEBRTC_RTC_BASE_CRITICALSECTION_H_
OLDNEW
« no previous file with comments | « webrtc/rtc_base/crc32_unittest.cc ('k') | webrtc/rtc_base/criticalsection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698