summaryrefslogtreecommitdiffstats
path: root/ssl/d1_srtp.c
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-21 11:28:19 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-21 11:28:19 +0200
commitefee6f38c15c10f6f97ceb656f152a3997bebd0a (patch)
treedce6815e6b1e43d6b79f8134a24025e66c43e7f2 /ssl/d1_srtp.c
parent5d8e636679ec928ea0c5f423c6c2645e724bc239 (diff)
parente92deaf08eb0ca9787492b40a6bd66e6357bfae7 (diff)
downloadreplicant_openssl-efee6f38c15c10f6f97ceb656f152a3997bebd0a.zip
replicant_openssl-efee6f38c15c10f6f97ceb656f152a3997bebd0a.tar.gz
replicant_openssl-efee6f38c15c10f6f97ceb656f152a3997bebd0a.tar.bz2
Merge remote-tracking branch 'github/cm-11.0'
Diffstat (limited to 'ssl/d1_srtp.c')
-rw-r--r--ssl/d1_srtp.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ssl/d1_srtp.c b/ssl/d1_srtp.c
index 928935b..ab9c419 100644
--- a/ssl/d1_srtp.c
+++ b/ssl/d1_srtp.c
@@ -115,11 +115,12 @@
Copyright (C) 2011, RTFM, Inc.
*/
-#ifndef OPENSSL_NO_SRTP
-
#include <stdio.h>
#include <openssl/objects.h>
#include "ssl_locl.h"
+
+#ifndef OPENSSL_NO_SRTP
+
#include "srtp.h"