zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use webrtc/base/checks.h in desktop_capture.

Browse Source 
Collided with CHECKs included in logging headers.

BUG=webrtc:5118
R=mflodman@webrtc.org

Review URL: https://codereview.webrtc.org/1418423003

Cr-Commit-Position: refs/heads/master@{#10425}
This commit is contained in:
pbos
2015-10-27 03:43:05 -07:00
committed by Commit bot
parent 85a0496b8c
commit 4f847da5a0
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/modules/desktop_capture/screen_capturer_x11.cc
View File

@ -18,6 +18,7 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include "webrtc/base/checks.h"
#include "webrtc/base/scoped_ptr.h" #include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/desktop_capture/desktop_capture_options.h" #include "webrtc/modules/desktop_capture/desktop_capture_options.h"
#include "webrtc/modules/desktop_capture/desktop_frame.h" #include "webrtc/modules/desktop_capture/desktop_frame.h"
@ -28,18 +29,7 @@
#include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/system_wrappers/interface/logging.h"
#include "webrtc/system_wrappers/interface/tick_util.h" #include "webrtc/system_wrappers/interface/tick_util.h"
// TODO(sergeyu): Move this to a header where it can be shared.
#if defined(NDEBUG)
#define RTC_DCHECK(condition) (void)(condition)
#else // NDEBUG
#define RTC_DCHECK(condition) \
if (!(condition)) { \
abort(); \
}
#endif
namespace webrtc { namespace webrtc {
namespace { namespace {
// A class to perform video frame capturing for Linux. // A class to perform video frame capturing for Linux.