| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2011 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2011 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_BASE_ATOMICOPS_H_ | 11 #ifndef WEBRTC_RTC_BASE_ATOMICOPS_H_ |
| 12 #define WEBRTC_BASE_ATOMICOPS_H_ | 12 #define WEBRTC_RTC_BASE_ATOMICOPS_H_ |
| 13 | 13 |
| 14 #if defined(WEBRTC_WIN) | 14 #if defined(WEBRTC_WIN) |
| 15 // Include winsock2.h before including <windows.h> to maintain consistency with | 15 // Include winsock2.h before including <windows.h> to maintain consistency with |
| 16 // win32.h. We can't include win32.h directly here since it pulls in | 16 // win32.h. We can't include win32.h directly here since it pulls in |
| 17 // headers such as basictypes.h which causes problems in Chromium where webrtc | 17 // headers such as basictypes.h which causes problems in Chromium where webrtc |
| 18 // exists as two separate projects, webrtc and libjingle. | 18 // exists as two separate projects, webrtc and libjingle. |
| 19 #include <winsock2.h> | 19 #include <winsock2.h> |
| 20 #include <windows.h> | 20 #include <windows.h> |
| 21 #endif // defined(WEBRTC_WIN) | 21 #endif // defined(WEBRTC_WIN) |
| 22 | 22 |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 static T* CompareAndSwapPtr(T* volatile* ptr, T* old_value, T* new_value) { | 77 static T* CompareAndSwapPtr(T* volatile* ptr, T* old_value, T* new_value) { |
| 78 return __sync_val_compare_and_swap(ptr, old_value, new_value); | 78 return __sync_val_compare_and_swap(ptr, old_value, new_value); |
| 79 } | 79 } |
| 80 #endif | 80 #endif |
| 81 }; | 81 }; |
| 82 | 82 |
| 83 | 83 |
| 84 | 84 |
| 85 } | 85 } |
| 86 | 86 |
| 87 #endif // WEBRTC_BASE_ATOMICOPS_H_ | 87 #endif // WEBRTC_RTC_BASE_ATOMICOPS_H_ |
| OLD | NEW |