webrtc/pc/srtpfilter.cc - Issue 1913043003: Revert of Remove the rtc_relative_path GYP variable and similar defines

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: webrtc/pc/srtpfilter.cc

Issue 1913043003: Revert of Remove the rtc_relative_path GYP variable and similar defines (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 4 years, 8 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:

View side-by-side diff with in-line comments

Download patch

Index: webrtc/pc/srtpfilter.cc

diff --git a/webrtc/pc/srtpfilter.cc b/webrtc/pc/srtpfilter.cc

index 7257debcaa565d6e605b34a8da9260e478defe5c..e8ea2890edab8b51cb273f483016c98dea0f186b 100644

--- a/webrtc/pc/srtpfilter.cc

+++ b/webrtc/pc/srtpfilter.cc

@@ -27,8 +27,13 @@

#ifdef HAVE_SRTP

extern "C" {

+#ifdef SRTP_RELATIVE_PATH

+#include "srtp.h" // NOLINT

+#include "srtp_priv.h" // NOLINT

+#else

#include "third_party/libsrtp/srtp/include/srtp.h"

#include "third_party/libsrtp/srtp/include/srtp_priv.h"

+#endif // SRTP_RELATIVE_PATH

}

#ifdef ENABLE_EXTERNAL_AUTH

#include "webrtc/pc/externalhmac.h"

« no previous file with comments | « webrtc/pc/pc.gyp ('k') | webrtc/pc/srtpfilter_unittest.cc » ('j') | no next file with comments »