From a101e560b990b8e9ca0d37672c55a532e6d2ec51 Mon Sep 17 00:00:00 2001 From: kjellander Date: Thu, 27 Oct 2016 02:34:31 -0700 Subject: [PATCH] Remove LOGGING=1 define. The LOGGING define is only used in a single location in our whole codebase: $ git gs "f LOGGING" webrtc/base/physicalsocketserver.cc:1584:#if LOGGING $ git gs "defined(LOGGING" (no hits) The above commands also give no hits in Chromium's code base. BUG=webrtc:6412 NOTRY=True Review-Url: https://codereview.webrtc.org/2442743002 Cr-Commit-Position: refs/heads/master@{#14799} --- webrtc/base/BUILD.gn | 7 ++----- webrtc/base/base.gyp | 1 - webrtc/base/physicalsocketserver.cc | 3 --- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn index 908c7b77ca..6c5a4bb3d8 100644 --- a/webrtc/base/BUILD.gn +++ b/webrtc/base/BUILD.gn @@ -26,10 +26,7 @@ config("rtc_base_approved_all_dependent_config") { } config("rtc_base_config") { - defines = [ - "FEATURE_ENABLE_SSL", - "LOGGING=1", - ] + defines = [ "FEATURE_ENABLE_SSL" ] } config("rtc_base_chromium_config") { @@ -350,6 +347,7 @@ rtc_static_library("rtc_base") { cflags = [] cflags_cc = [] libs = [] + defines = [] deps = [ "..:webrtc_common", ] @@ -368,7 +366,6 @@ rtc_static_library("rtc_base") { ] all_dependent_configs = [ ":rtc_base_all_dependent_config" ] - defines = [ "LOGGING=1" ] sources = [ "applefilesystem.mm", diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp index fc3ae48950..080d203e30 100644 --- a/webrtc/base/base.gyp +++ b/webrtc/base/base.gyp @@ -232,7 +232,6 @@ 'FEATURE_ENABLE_SSL', 'SSL_USE_OPENSSL', 'HAVE_OPENSSL_SSL_H', - 'LOGGING=1', ], 'sources': [ 'applefilesystem.mm', diff --git a/webrtc/base/physicalsocketserver.cc b/webrtc/base/physicalsocketserver.cc index f0dc69fe67..2a48274fa0 100644 --- a/webrtc/base/physicalsocketserver.cc +++ b/webrtc/base/physicalsocketserver.cc @@ -1580,8 +1580,6 @@ bool PhysicalSocketServer::Wait(int cmsWait, bool process_io) { WSANETWORKEVENTS wsaEvents; int err = WSAEnumNetworkEvents(s, events[0], &wsaEvents); if (err == 0) { - -#if LOGGING { if ((wsaEvents.lNetworkEvents & FD_READ) && wsaEvents.iErrorCode[FD_READ_BIT] != 0) { @@ -1609,7 +1607,6 @@ bool PhysicalSocketServer::Wait(int cmsWait, bool process_io) { << wsaEvents.iErrorCode[FD_CLOSE_BIT]; } } -#endif uint32_t ff = 0; int errcode = 0; if (wsaEvents.lNetworkEvents & FD_READ)