srtp: rename srtp.h -> ortp_srtp.h to avoid conflicts

parent 22b2d1e2
......@@ -5,7 +5,7 @@ ortp_includedir=$(includedir)/ortp
ortp_include_HEADERS=str_utils.h rtpsession.h rtp.h port.h \
ortp.h telephonyevents.h sessionset.h payloadtype.h rtpsignaltable.h \
rtcp.h \
event.h stun.h stun_udp.h srtp.h zrtp.h \
event.h stun.h stun_udp.h ortp_srtp.h zrtp.h \
b64.h
EXTRA_DIST=$(ortp_include_HEADERS)
......@@ -20,7 +20,12 @@
#ifndef ortp_srtp_h
#define ortp_srtp_h
#ifndef ANDROID
#include <srtp/srtp.h>
#else
// Android doesn't use make install
#include <srtp.h>
#endif
#include <ortp/rtpsession.h>
#ifdef __cplusplus
......
......@@ -29,7 +29,7 @@ libortp_la_SOURCES= str_utils.c \
rtcpparse.c \
event.c \
stun.c stun_udp.c \
srtp.c \
ortp_srtp.c \
b64.c \
zrtp.c
......
......@@ -26,13 +26,12 @@
#ifdef HAVE_SRTP
#include <srtp/srtp.h>
#undef PACKAGE_NAME
#undef PACKAGE_STRING
#undef PACKAGE_TARNAME
#undef PACKAGE_VERSION
#include "ortp/srtp.h"
#include "ortp/ortp_srtp.h"
#include "ortp/b64.h"
#define SRTP_PAD_BYTES 64 /*?? */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment