From 4f847da5a004ae18a5527232d8e982fe0d4cb77d Mon Sep 17 00:00:00 2001 From: pbos Date: Tue, 27 Oct 2015 03:43:05 -0700 Subject: [PATCH] Use webrtc/base/checks.h in desktop_capture. 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} --- .../modules/desktop_capture/screen_capturer_x11.cc | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/webrtc/modules/desktop_capture/screen_capturer_x11.cc b/webrtc/modules/desktop_capture/screen_capturer_x11.cc index 75655762e9..e34beda7b7 100644 --- a/webrtc/modules/desktop_capture/screen_capturer_x11.cc +++ b/webrtc/modules/desktop_capture/screen_capturer_x11.cc @@ -18,6 +18,7 @@ #include #include +#include "webrtc/base/checks.h" #include "webrtc/base/scoped_ptr.h" #include "webrtc/modules/desktop_capture/desktop_capture_options.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/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 { // A class to perform video frame capturing for Linux.