From decde85859e8607242dfeb9a5b36666536c85c2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= Date: Fri, 4 Jun 2021 14:21:18 +0300 Subject: [PATCH] build: Move private headers out from include folder --- CMakeLists.txt | 4 --- include/lib.hh | 50 +++++--------------------- {include => src}/dispatch.hh | 0 src/formats/h264.cc | 6 ++-- {include => src}/formats/h264.hh | 2 +- src/formats/h264_pkt_handler.cc | 4 +-- src/formats/h265.cc | 8 ++--- {include => src}/formats/h265.hh | 2 +- src/formats/h265_pkt_handler.cc | 6 ++-- src/formats/h266.cc | 6 ++-- {include => src}/formats/h266.hh | 2 +- src/formats/h266_pkt_handler.cc | 6 ++-- src/formats/h26x.cc | 6 ++-- {include => src}/formats/h26x.hh | 0 src/formats/media.cc | 4 +-- {include => src}/formats/media.hh | 2 +- {include => src}/holepuncher.hh | 0 {include => src}/hostname.hh | 0 {include => src}/mingw_inet.hh | 0 {include => src}/multicast.hh | 0 {include => src}/pkt_dispatch.hh | 0 {include => src}/poll.hh | 0 {include => src}/queue.hh | 0 {include => src}/random.hh | 0 src/rtcp/app.cc | 2 +- src/rtcp/receiver.cc | 2 +- src/rtcp/rtcp_runner.cc | 2 +- src/rtcp/sdes.cc | 2 +- src/rtcp/sender.cc | 2 +- {include => src}/rtp.hh | 0 src/srtp/base.cc | 4 +-- {include => src}/srtp/base.hh | 2 +- src/srtp/srtcp.cc | 2 +- {include => src}/srtp/srtcp.hh | 0 src/srtp/srtp.cc | 4 +-- {include => src}/srtp/srtp.hh | 0 {include => src}/zrtp.hh | 0 src/zrtp/commit.cc | 4 +-- {include => src}/zrtp/commit.hh | 2 +- src/zrtp/confack.cc | 4 +-- {include => src}/zrtp/confack.hh | 4 +-- src/zrtp/confirm.cc | 4 +-- {include => src}/zrtp/confirm.hh | 2 +- {include => src}/zrtp/defines.hh | 2 +- src/zrtp/dh_kxchng.cc | 6 ++-- {include => src}/zrtp/dh_kxchng.hh | 2 +- src/zrtp/error.cc | 6 ++-- {include => src}/zrtp/error.hh | 2 +- src/zrtp/hello.cc | 6 ++-- {include => src}/zrtp/hello.hh | 2 +- src/zrtp/hello_ack.cc | 6 ++-- {include => src}/zrtp/hello_ack.hh | 2 +- src/zrtp/zrtp_receiver.cc | 18 +++++----- {include => src}/zrtp/zrtp_receiver.hh | 0 54 files changed, 82 insertions(+), 120 deletions(-) rename {include => src}/dispatch.hh (100%) rename {include => src}/formats/h264.hh (99%) rename {include => src}/formats/h265.hh (99%) rename {include => src}/formats/h266.hh (99%) rename {include => src}/formats/h26x.hh (100%) rename {include => src}/formats/media.hh (99%) rename {include => src}/holepuncher.hh (100%) rename {include => src}/hostname.hh (100%) rename {include => src}/mingw_inet.hh (100%) rename {include => src}/multicast.hh (100%) rename {include => src}/pkt_dispatch.hh (100%) rename {include => src}/poll.hh (100%) rename {include => src}/queue.hh (100%) rename {include => src}/random.hh (100%) rename {include => src}/rtp.hh (100%) rename {include => src}/srtp/base.hh (99%) rename {include => src}/srtp/srtcp.hh (100%) rename {include => src}/srtp/srtp.hh (100%) rename {include => src}/zrtp.hh (100%) rename {include => src}/zrtp/commit.hh (97%) rename {include => src}/zrtp/confack.hh (93%) rename {include => src}/zrtp/confirm.hh (98%) rename {include => src}/zrtp/defines.hh (99%) rename {include => src}/zrtp/dh_kxchng.hh (97%) rename {include => src}/zrtp/error.hh (96%) rename {include => src}/zrtp/hello.hh (98%) rename {include => src}/zrtp/hello_ack.hh (96%) rename {include => src}/zrtp/zrtp_receiver.hh (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ffd8ddb..a91071a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,10 +60,6 @@ add_library(uvgrtp STATIC target_include_directories(uvgrtp PUBLIC ${PROJECT_SOURCE_DIR}/include - ${PROJECT_SOURCE_DIR}/include/formats - ${PROJECT_SOURCE_DIR}/include/zrtp - ${PROJECT_SOURCE_DIR}/include/rtcp - ${PROJECT_SOURCE_DIR}/include/srtp ) set(LIBRARY_PATHS "") diff --git a/include/lib.hh b/include/lib.hh index 7189cc8..2c74376 100644 --- a/include/lib.hh +++ b/include/lib.hh @@ -1,48 +1,14 @@ #pragma once // these includes are here for easier usage of this library -// At this point I don't know which ones are required so I'll include them all -#include "formats/h26x.hh" -#include "formats/h264.hh" -#include "formats/h265.hh" -#include "formats/h266.hh" -#include "formats/media.hh" - -#include "srtp/base.hh" -#include "srtp/srtcp.hh" -#include "srtp/srtp.hh" - -#include "zrtp/commit.hh" -#include "zrtp/confack.hh" -#include "zrtp/confirm.hh" -#include "zrtp/defines.hh" -#include "zrtp/dh_kxchng.hh" -#include "zrtp/error.hh" -#include "zrtp/hello.hh" -#include "zrtp/hello_ack.hh" -#include "zrtp/zrtp_receiver.hh" - -#include "clock.hh" -#include "crypto.hh" -#include "debug.hh" -#include "dispatch.hh" -#include "frame.hh" -#include "holepuncher.hh" -#include "hostname.hh" -#include "media_stream.hh" -#include "mingw_inet.hh" -#include "multicast.hh" -#include "pkt_dispatch.hh" -#include "poll.hh" -#include "queue.hh" -#include "random.hh" -#include "rtcp.hh" -#include "rtp.hh" -#include "runner.hh" -#include "session.hh" -#include "socket.hh" -#include "util.hh" -#include "zrtp.hh" +#include "media_stream.hh" // media streamer class +#include "session.hh" // session class +#include "rtcp.hh" // RTCP +#include "clock.hh" // time related functions +#include "crypto.hh" // check if crypto is enabled +#include "debug.hh" // debug prints +#include "frame.hh" // frame related functions +#include "util.hh" // types #include #include diff --git a/include/dispatch.hh b/src/dispatch.hh similarity index 100% rename from include/dispatch.hh rename to src/dispatch.hh diff --git a/src/formats/h264.cc b/src/formats/h264.cc index 896c6ac..3ee5df8 100644 --- a/src/formats/h264.cc +++ b/src/formats/h264.cc @@ -1,7 +1,7 @@ -#include "formats/h264.hh" +#include "h264.hh" -#include "queue.hh" -#include "rtp.hh" +#include "../queue.hh" +#include "../rtp.hh" #include "debug.hh" #include diff --git a/include/formats/h264.hh b/src/formats/h264.hh similarity index 99% rename from include/formats/h264.hh rename to src/formats/h264.hh index a1d1c43..0a8837e 100644 --- a/include/formats/h264.hh +++ b/src/formats/h264.hh @@ -1,6 +1,6 @@ #pragma once -#include "formats/h26x.hh" +#include "h26x.hh" #include "clock.hh" #include "util.hh" #include "frame.hh" diff --git a/src/formats/h264_pkt_handler.cc b/src/formats/h264_pkt_handler.cc index 0304708..e023ae7 100644 --- a/src/formats/h264_pkt_handler.cc +++ b/src/formats/h264_pkt_handler.cc @@ -1,6 +1,6 @@ -#include "formats/h264.hh" +#include "h264.hh" -#include "queue.hh" +#include "../queue.hh" #include "debug.hh" #include diff --git a/src/formats/h265.cc b/src/formats/h265.cc index 9056d14..427ba56 100644 --- a/src/formats/h265.cc +++ b/src/formats/h265.cc @@ -1,8 +1,8 @@ -#include "formats/h265.hh" +#include "h265.hh" -#include "srtp/srtcp.hh" -#include "rtp.hh" -#include "queue.hh" +#include "../srtp/srtcp.hh" +#include "../rtp.hh" +#include "../queue.hh" #include "debug.hh" #include diff --git a/include/formats/h265.hh b/src/formats/h265.hh similarity index 99% rename from include/formats/h265.hh rename to src/formats/h265.hh index 0e0fdf0..15f91c0 100644 --- a/include/formats/h265.hh +++ b/src/formats/h265.hh @@ -1,6 +1,6 @@ #pragma once -#include "formats/h26x.hh" +#include "h26x.hh" #include "clock.hh" #include "util.hh" #include "frame.hh" diff --git a/src/formats/h265_pkt_handler.cc b/src/formats/h265_pkt_handler.cc index 9175abe..348ed9f 100644 --- a/src/formats/h265_pkt_handler.cc +++ b/src/formats/h265_pkt_handler.cc @@ -1,7 +1,7 @@ -#include "formats/h265.hh" +#include "h265.hh" -#include "rtp.hh" -#include "queue.hh" +#include "../rtp.hh" +#include "../queue.hh" #include "debug.hh" #include diff --git a/src/formats/h266.cc b/src/formats/h266.cc index a1259bc..847076b 100644 --- a/src/formats/h266.cc +++ b/src/formats/h266.cc @@ -1,7 +1,7 @@ -#include "formats/h266.hh" +#include "h266.hh" -#include "rtp.hh" -#include "queue.hh" +#include "../rtp.hh" +#include "../queue.hh" #include "frame.hh" #include "debug.hh" diff --git a/include/formats/h266.hh b/src/formats/h266.hh similarity index 99% rename from include/formats/h266.hh rename to src/formats/h266.hh index c8b16df..c7d1547 100644 --- a/include/formats/h266.hh +++ b/src/formats/h266.hh @@ -1,6 +1,6 @@ #pragma once -#include "formats/h26x.hh" +#include "h26x.hh" #include "util.hh" diff --git a/src/formats/h266_pkt_handler.cc b/src/formats/h266_pkt_handler.cc index 86b51ed..aebb5d0 100644 --- a/src/formats/h266_pkt_handler.cc +++ b/src/formats/h266_pkt_handler.cc @@ -1,7 +1,7 @@ -#include "formats/h266.hh" +#include "h266.hh" -#include "rtp.hh" -#include "queue.hh" +#include "../rtp.hh" +#include "../queue.hh" #include "debug.hh" #include diff --git a/src/formats/h26x.cc b/src/formats/h26x.cc index 6c40567..03c5096 100644 --- a/src/formats/h26x.cc +++ b/src/formats/h26x.cc @@ -1,7 +1,7 @@ -#include "formats/h26x.hh" +#include "h26x.hh" -#include "rtp.hh" -#include "queue.hh" +#include "../rtp.hh" +#include "../queue.hh" #include "socket.hh" #include "debug.hh" diff --git a/include/formats/h26x.hh b/src/formats/h26x.hh similarity index 100% rename from include/formats/h26x.hh rename to src/formats/h26x.hh diff --git a/src/formats/media.cc b/src/formats/media.cc index dcd7411..7927210 100644 --- a/src/formats/media.cc +++ b/src/formats/media.cc @@ -1,7 +1,7 @@ -#include "formats/media.hh" +#include "media.hh" #include "../rtp.hh" -#include "../socket.hh" +#include "socket.hh" #include "../queue.hh" #include "debug.hh" diff --git a/include/formats/media.hh b/src/formats/media.hh similarity index 99% rename from include/formats/media.hh rename to src/formats/media.hh index ce82562..e968f69 100644 --- a/include/formats/media.hh +++ b/src/formats/media.hh @@ -1,6 +1,6 @@ #pragma once -#include "../util.hh" +#include "util.hh" #include #include diff --git a/include/holepuncher.hh b/src/holepuncher.hh similarity index 100% rename from include/holepuncher.hh rename to src/holepuncher.hh diff --git a/include/hostname.hh b/src/hostname.hh similarity index 100% rename from include/hostname.hh rename to src/hostname.hh diff --git a/include/mingw_inet.hh b/src/mingw_inet.hh similarity index 100% rename from include/mingw_inet.hh rename to src/mingw_inet.hh diff --git a/include/multicast.hh b/src/multicast.hh similarity index 100% rename from include/multicast.hh rename to src/multicast.hh diff --git a/include/pkt_dispatch.hh b/src/pkt_dispatch.hh similarity index 100% rename from include/pkt_dispatch.hh rename to src/pkt_dispatch.hh diff --git a/include/poll.hh b/src/poll.hh similarity index 100% rename from include/poll.hh rename to src/poll.hh diff --git a/include/queue.hh b/src/queue.hh similarity index 100% rename from include/queue.hh rename to src/queue.hh diff --git a/include/random.hh b/src/random.hh similarity index 100% rename from include/random.hh rename to src/random.hh diff --git a/src/rtcp/app.cc b/src/rtcp/app.cc index c29ff11..e764193 100644 --- a/src/rtcp/app.cc +++ b/src/rtcp/app.cc @@ -1,6 +1,6 @@ #include "rtcp.hh" -#include "srtp/srtcp.hh" +#include "../srtp/srtcp.hh" #include "debug.hh" uvgrtp::frame::rtcp_app_packet *uvgrtp::rtcp::get_app_packet(uint32_t ssrc) diff --git a/src/rtcp/receiver.cc b/src/rtcp/receiver.cc index ec95a2d..9946a9c 100644 --- a/src/rtcp/receiver.cc +++ b/src/rtcp/receiver.cc @@ -1,6 +1,6 @@ #include "rtcp.hh" -#include "srtp/srtcp.hh" +#include "../srtp/srtcp.hh" #include "debug.hh" uvgrtp::frame::rtcp_receiver_report *uvgrtp::rtcp::get_receiver_packet(uint32_t ssrc) diff --git a/src/rtcp/rtcp_runner.cc b/src/rtcp/rtcp_runner.cc index 6b10710..906dbf2 100644 --- a/src/rtcp/rtcp_runner.cc +++ b/src/rtcp/rtcp_runner.cc @@ -1,5 +1,5 @@ #include "rtcp.hh" -#include "poll.hh" +#include "../poll.hh" #include "debug.hh" diff --git a/src/rtcp/sdes.cc b/src/rtcp/sdes.cc index 940506d..603fb0b 100644 --- a/src/rtcp/sdes.cc +++ b/src/rtcp/sdes.cc @@ -1,6 +1,6 @@ #include "rtcp.hh" -#include "srtp/srtcp.hh" +#include "../srtp/srtcp.hh" #include "debug.hh" uvgrtp::frame::rtcp_sdes_packet *uvgrtp::rtcp::get_sdes_packet(uint32_t ssrc) diff --git a/src/rtcp/sender.cc b/src/rtcp/sender.cc index 36eda38..2c732a5 100644 --- a/src/rtcp/sender.cc +++ b/src/rtcp/sender.cc @@ -1,6 +1,6 @@ #include "rtcp.hh" -#include "srtp/srtcp.hh" +#include "../srtp/srtcp.hh" #include "debug.hh" uvgrtp::frame::rtcp_sender_report *uvgrtp::rtcp::get_sender_packet(uint32_t ssrc) diff --git a/include/rtp.hh b/src/rtp.hh similarity index 100% rename from include/rtp.hh rename to src/rtp.hh diff --git a/src/srtp/base.cc b/src/srtp/base.cc index 7a9e572..16cea90 100644 --- a/src/srtp/base.cc +++ b/src/srtp/base.cc @@ -1,7 +1,7 @@ -#include "srtp/base.hh" +#include "base.hh" #include "crypto.hh" -#include "zrtp.hh" +#include "../zrtp.hh" #include "debug.hh" #include diff --git a/include/srtp/base.hh b/src/srtp/base.hh similarity index 99% rename from include/srtp/base.hh rename to src/srtp/base.hh index 08fc872..25df7ae 100644 --- a/include/srtp/base.hh +++ b/src/srtp/base.hh @@ -1,6 +1,6 @@ #pragma once -#include "../util.hh" +#include "util.hh" #ifdef _WIN32 #include diff --git a/src/srtp/srtcp.cc b/src/srtp/srtcp.cc index 633ad59..7b62476 100644 --- a/src/srtp/srtcp.cc +++ b/src/srtp/srtcp.cc @@ -1,4 +1,4 @@ -#include "srtp/srtcp.hh" +#include "srtcp.hh" #include "crypto.hh" #include "debug.hh" diff --git a/include/srtp/srtcp.hh b/src/srtp/srtcp.hh similarity index 100% rename from include/srtp/srtcp.hh rename to src/srtp/srtcp.hh diff --git a/src/srtp/srtp.cc b/src/srtp/srtp.cc index e0d5a73..5d44f54 100644 --- a/src/srtp/srtp.cc +++ b/src/srtp/srtp.cc @@ -1,6 +1,6 @@ -#include "srtp/srtp.hh" +#include "srtp.hh" -#include "srtp/base.hh" +#include "base.hh" #include "crypto.hh" #include "debug.hh" #include "frame.hh" diff --git a/include/srtp/srtp.hh b/src/srtp/srtp.hh similarity index 100% rename from include/srtp/srtp.hh rename to src/srtp/srtp.hh diff --git a/include/zrtp.hh b/src/zrtp.hh similarity index 100% rename from include/zrtp.hh rename to src/zrtp.hh diff --git a/src/zrtp/commit.cc b/src/zrtp/commit.cc index 77f512f..66e386b 100644 --- a/src/zrtp/commit.cc +++ b/src/zrtp/commit.cc @@ -1,6 +1,6 @@ -#include "zrtp/commit.hh" +#include "commit.hh" -#include "zrtp.hh" +#include "../zrtp.hh" #include "crypto.hh" #include "debug.hh" #include "frame.hh" diff --git a/include/zrtp/commit.hh b/src/zrtp/commit.hh similarity index 97% rename from include/zrtp/commit.hh rename to src/zrtp/commit.hh index a642a55..364ad23 100644 --- a/include/zrtp/commit.hh +++ b/src/zrtp/commit.hh @@ -1,7 +1,7 @@ #pragma once -#include "zrtp/defines.hh" +#include "defines.hh" #include "util.hh" diff --git a/src/zrtp/confack.cc b/src/zrtp/confack.cc index f191fcb..a30e972 100644 --- a/src/zrtp/confack.cc +++ b/src/zrtp/confack.cc @@ -1,6 +1,6 @@ -#include "zrtp/confack.hh" +#include "confack.hh" -#include "zrtp.hh" +#include "../zrtp.hh" #include "crypto.hh" #include "frame.hh" #include "socket.hh" diff --git a/include/zrtp/confack.hh b/src/zrtp/confack.hh similarity index 93% rename from include/zrtp/confack.hh rename to src/zrtp/confack.hh index 34c7839..51a7f99 100644 --- a/include/zrtp/confack.hh +++ b/src/zrtp/confack.hh @@ -1,7 +1,7 @@ #pragma once -#include "zrtp/defines.hh" -#include "zrtp/zrtp_receiver.hh" +#include "defines.hh" +#include "zrtp_receiver.hh" #include "util.hh" diff --git a/src/zrtp/confirm.cc b/src/zrtp/confirm.cc index 8ed10ff..01fc83f 100644 --- a/src/zrtp/confirm.cc +++ b/src/zrtp/confirm.cc @@ -1,6 +1,6 @@ -#include "zrtp/confirm.hh" +#include "confirm.hh" -#include "zrtp.hh" +#include "../zrtp.hh" #include "crypto.hh" #include "frame.hh" #include "socket.hh" diff --git a/include/zrtp/confirm.hh b/src/zrtp/confirm.hh similarity index 98% rename from include/zrtp/confirm.hh rename to src/zrtp/confirm.hh index cde67ea..dba1caf 100644 --- a/include/zrtp/confirm.hh +++ b/src/zrtp/confirm.hh @@ -1,7 +1,7 @@ #pragma once -#include "zrtp/defines.hh" +#include "defines.hh" #include "util.hh" diff --git a/include/zrtp/defines.hh b/src/zrtp/defines.hh similarity index 99% rename from include/zrtp/defines.hh rename to src/zrtp/defines.hh index c3050bf..f249558 100644 --- a/include/zrtp/defines.hh +++ b/src/zrtp/defines.hh @@ -1,6 +1,6 @@ #pragma once -#include "../util.hh" +#include "util.hh" namespace uvgrtp { diff --git a/src/zrtp/dh_kxchng.cc b/src/zrtp/dh_kxchng.cc index 0e3c168..3a9f6cc 100644 --- a/src/zrtp/dh_kxchng.cc +++ b/src/zrtp/dh_kxchng.cc @@ -1,8 +1,8 @@ -#include "zrtp/dh_kxchng.hh" +#include "dh_kxchng.hh" -#include "zrtp/zrtp_receiver.hh" +#include "zrtp_receiver.hh" -#include "zrtp.hh" +#include "../zrtp.hh" #include "crypto.hh" #include "frame.hh" #include "socket.hh" diff --git a/include/zrtp/dh_kxchng.hh b/src/zrtp/dh_kxchng.hh similarity index 97% rename from include/zrtp/dh_kxchng.hh rename to src/zrtp/dh_kxchng.hh index e2838c0..7cdada8 100644 --- a/include/zrtp/dh_kxchng.hh +++ b/src/zrtp/dh_kxchng.hh @@ -1,6 +1,6 @@ #pragma once -#include "zrtp/defines.hh" +#include "defines.hh" #include "util.hh" diff --git a/src/zrtp/error.cc b/src/zrtp/error.cc index 870996a..1a617fe 100644 --- a/src/zrtp/error.cc +++ b/src/zrtp/error.cc @@ -1,8 +1,8 @@ -#include "zrtp/error.hh" +#include "error.hh" -#include "zrtp/zrtp_receiver.hh" +#include "zrtp_receiver.hh" -#include "zrtp.hh" +#include "../zrtp.hh" #include "crypto.hh" #include "socket.hh" #include "frame.hh" diff --git a/include/zrtp/error.hh b/src/zrtp/error.hh similarity index 96% rename from include/zrtp/error.hh rename to src/zrtp/error.hh index ca65ebe..f5de37b 100644 --- a/include/zrtp/error.hh +++ b/src/zrtp/error.hh @@ -1,6 +1,6 @@ #pragma once -#include "zrtp/defines.hh" +#include "defines.hh" #include "util.hh" diff --git a/src/zrtp/hello.cc b/src/zrtp/hello.cc index a96b018..5f5234e 100644 --- a/src/zrtp/hello.cc +++ b/src/zrtp/hello.cc @@ -1,8 +1,8 @@ -#include "zrtp/hello.hh" +#include "hello.hh" -#include "zrtp/zrtp_receiver.hh" +#include "zrtp_receiver.hh" -#include "zrtp.hh" +#include "../zrtp.hh" #include "crypto.hh" #include "frame.hh" #include "socket.hh" diff --git a/include/zrtp/hello.hh b/src/zrtp/hello.hh similarity index 98% rename from include/zrtp/hello.hh rename to src/zrtp/hello.hh index cd2bbef..3445676 100644 --- a/include/zrtp/hello.hh +++ b/src/zrtp/hello.hh @@ -1,6 +1,6 @@ #pragma once -#include "zrtp/defines.hh" +#include "defines.hh" #include "util.hh" diff --git a/src/zrtp/hello_ack.cc b/src/zrtp/hello_ack.cc index ff56d27..0d8e83e 100644 --- a/src/zrtp/hello_ack.cc +++ b/src/zrtp/hello_ack.cc @@ -1,8 +1,8 @@ -#include "zrtp/hello_ack.hh" +#include "hello_ack.hh" -#include "zrtp/zrtp_receiver.hh" +#include "zrtp_receiver.hh" -#include "zrtp.hh" +#include "../zrtp.hh" #include "crypto.hh" #include "frame.hh" #include "socket.hh" diff --git a/include/zrtp/hello_ack.hh b/src/zrtp/hello_ack.hh similarity index 96% rename from include/zrtp/hello_ack.hh rename to src/zrtp/hello_ack.hh index 1722de4..765b43b 100644 --- a/include/zrtp/hello_ack.hh +++ b/src/zrtp/hello_ack.hh @@ -1,6 +1,6 @@ #pragma once -#include "zrtp/defines.hh" +#include "defines.hh" #include "util.hh" diff --git a/src/zrtp/zrtp_receiver.cc b/src/zrtp/zrtp_receiver.cc index cfd170b..7a8b550 100644 --- a/src/zrtp/zrtp_receiver.cc +++ b/src/zrtp/zrtp_receiver.cc @@ -1,16 +1,16 @@ -#include "zrtp/zrtp_receiver.hh" +#include "zrtp_receiver.hh" -#include "zrtp/defines.hh" -#include "zrtp/dh_kxchng.hh" -#include "zrtp/commit.hh" -#include "zrtp/confack.hh" -#include "zrtp/confirm.hh" -#include "zrtp/hello.hh" -#include "zrtp/hello_ack.hh" +#include "defines.hh" +#include "dh_kxchng.hh" +#include "commit.hh" +#include "confack.hh" +#include "confirm.hh" +#include "hello.hh" +#include "hello_ack.hh" #include "socket.hh" #include "crypto.hh" -#include "poll.hh" +#include "../poll.hh" #include "debug.hh" #include "util.hh" diff --git a/include/zrtp/zrtp_receiver.hh b/src/zrtp/zrtp_receiver.hh similarity index 100% rename from include/zrtp/zrtp_receiver.hh rename to src/zrtp/zrtp_receiver.hh