diff options
| author | kjellander <kjellander@webrtc.org> | 2016-01-14 11:01:09 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-14 19:01:25 +0000 |
| commit | fcfc804e436502d49b2176fec1f40dce3585527f (patch) | |
| tree | 24cc77d16648f1b7199d86a69f59e83716078672 /talk/media/devices/devicemanager.cc | |
| parent | 3542013f587f0858fb24fa8e554ec3c01a323da8 (diff) | |
| download | webrtc-fcfc804e436502d49b2176fec1f40dce3585527f.tar.gz | |
Eliminate defines in talk/
Replace LINUX, OSX and IOS defines with WEBRTC_ prefixed versions.
Remove no longer used defines from talk/build/common.gypi due to
previously migrated sources (into webrtc/p2p and webrtc/libjingle).
When this is rolled into Chromium, we can also clean up the platform
defines in
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/libjingle/libjingle.gyp
NOTRY=True
BUG=webrtc:5420
TESTED=Ran all compile trybots with --clobber flag.
TBR=tommi@webrtc.org
Review URL: https://codereview.webrtc.org/1588453005
Cr-Commit-Position: refs/heads/master@{#11254}
Diffstat (limited to 'talk/media/devices/devicemanager.cc')
| -rw-r--r-- | talk/media/devices/devicemanager.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/talk/media/devices/devicemanager.cc b/talk/media/devices/devicemanager.cc index 1d7ac5baf1..eca14a5def 100644 --- a/talk/media/devices/devicemanager.cc +++ b/talk/media/devices/devicemanager.cc @@ -123,7 +123,7 @@ bool DeviceManager::GetAudioOutputDevice(const std::string& name, Device* out) { bool DeviceManager::GetVideoCaptureDevices(std::vector<Device>* devices) { devices->clear(); -#if defined(ANDROID) || defined(IOS) +#if defined(ANDROID) || defined(WEBRTC_IOS) // On Android and iOS, we treat the camera(s) as a single device. Even if // there are multiple cameras, that's abstracted away at a higher level. Device dev("camera", "1"); // name and ID |