admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build/use constructormagic.h unconditionally.

Browse Source 
These macros no longer collide with Chromium since they are prefixed
with RTC_.

BUG=
R=henrikg@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#10801}
This commit is contained in:
Peter Boström 2015-11-26 12:54:24 +01:00
parent 8f9902a0ff
commit fd5dae395b
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/base/BUILD.gn
View File

@ -115,6 +115,7 @@ static_library("rtc_base_approved") {
"byteorder.h", "byteorder.h",
"checks.cc", "checks.cc",
"checks.h", "checks.h",
"constructormagic.h",
"criticalsection.cc", "criticalsection.cc",
"criticalsection.h", "criticalsection.h",
"event.cc", "event.cc",
@ -162,7 +163,6 @@ static_library("rtc_base_approved") {
include_dirs = [ "../../webrtc_overrides" ] include_dirs = [ "../../webrtc_overrides" ]
} else { } else {
sources += [ sources += [
"constructormagic.h",
"logging.cc", "logging.cc",
"logging.h", "logging.h",
] ]

1
webrtc/base/base.gyp
View File

@ -395,7 +395,6 @@
'bandwidthsmoother.h', 'bandwidthsmoother.h',
'bind.h', 'bind.h',
'callback.h', 'callback.h',
'constructormagic.h',
'dbus.cc', 'dbus.cc',
'dbus.h', 'dbus.h',
'diskcache_win32.cc', 'diskcache_win32.cc',