talk/media/base/mediaengine.h - Issue 1588453005: Eliminate defines in talk/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: talk/media/base/mediaengine.h

Issue 1588453005: Eliminate defines in talk/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Excluding iOS from converted OSX defines Created 4 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: talk/media/base/mediaengine.h

diff --git a/talk/media/base/mediaengine.h b/talk/media/base/mediaengine.h

index 43b4de5a52ddf8467def3ea4c77662057f0655e7..467614bb3eaa4cea214d1a044558222cc3d5bed0 100644

--- a/talk/media/base/mediaengine.h

+++ b/talk/media/base/mediaengine.h

@@ -28,7 +28,7 @@

#ifndef TALK_MEDIA_BASE_MEDIAENGINE_H_

#define TALK_MEDIA_BASE_MEDIAENGINE_H_

-#ifdef OSX

+#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)

#include <CoreAudio/CoreAudio.h>

#endif

« no previous file with comments | « talk/media/base/executablehelpers.h ('k') | talk/media/base/videocapturer.cc » ('j') | no next file with comments »