From dbee42b099c794aa5402068870afdc9739a8be38 Mon Sep 17 00:00:00 2001 From: Paul-Louis Ageneau Date: Sun, 28 Feb 2021 14:38:12 +0100 Subject: [PATCH] Renamed include.hpp to common.hpp --- CMakeLists.txt | 2 +- include/rtc/candidate.hpp | 2 +- include/rtc/channel.hpp | 2 +- include/rtc/{include.hpp => common.hpp} | 4 ++-- include/rtc/configuration.hpp | 2 +- include/rtc/datachannel.hpp | 2 +- include/rtc/description.hpp | 2 +- include/rtc/init.hpp | 2 +- include/rtc/log.hpp | 2 +- include/rtc/mediahandler.hpp | 2 +- include/rtc/mediahandlerelement.hpp | 2 +- include/rtc/message.hpp | 2 +- include/rtc/nalunit.hpp | 2 +- include/rtc/peerconnection.hpp | 2 +- include/rtc/queue.hpp | 2 +- include/rtc/reliability.hpp | 2 +- include/rtc/rtc.hpp | 2 +- include/rtc/rtcpreceivingsession.hpp | 2 +- include/rtc/track.hpp | 2 +- include/rtc/websocket.hpp | 2 +- src/capi.cpp | 2 +- src/datachannel.cpp | 2 +- src/globals.hpp | 2 +- src/impl/base64.hpp | 2 +- src/impl/certificate.hpp | 2 +- src/impl/channel.hpp | 2 +- src/impl/datachannel.cpp | 2 +- src/impl/datachannel.hpp | 2 +- src/impl/dtlssrtptransport.hpp | 2 +- src/impl/dtlstransport.hpp | 2 +- src/impl/icetransport.hpp | 2 +- src/impl/logcounter.hpp | 2 +- src/impl/peerconnection.cpp | 2 +- src/impl/peerconnection.hpp | 2 +- src/impl/processor.hpp | 2 +- src/impl/sctptransport.hpp | 2 +- src/impl/tcptransport.hpp | 2 +- src/impl/threadpool.hpp | 2 +- src/impl/tls.hpp | 2 +- src/impl/tlstransport.hpp | 2 +- src/impl/track.hpp | 2 +- src/impl/transport.hpp | 2 +- src/impl/verifiedtlstransport.cpp | 2 +- src/impl/websocket.cpp | 2 +- src/impl/websocket.hpp | 2 +- src/impl/wstransport.hpp | 2 +- src/peerconnection.cpp | 2 +- src/websocket.cpp | 2 +- 48 files changed, 49 insertions(+), 49 deletions(-) rename include/rtc/{include.hpp => common.hpp} (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index a6c5654..47f4e55 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,7 +81,7 @@ set(LIBDATACHANNEL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/description.hpp ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/mediahandler.hpp ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/rtcpreceivingsession.hpp - ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/include.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/common.hpp ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/init.hpp ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/log.hpp ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc/message.hpp diff --git a/include/rtc/candidate.hpp b/include/rtc/candidate.hpp index 637717e..56b32a0 100644 --- a/include/rtc/candidate.hpp +++ b/include/rtc/candidate.hpp @@ -19,7 +19,7 @@ #ifndef RTC_CANDIDATE_H #define RTC_CANDIDATE_H -#include "include.hpp" +#include "common.hpp" #include diff --git a/include/rtc/channel.hpp b/include/rtc/channel.hpp index a9797e1..b3367f9 100644 --- a/include/rtc/channel.hpp +++ b/include/rtc/channel.hpp @@ -19,7 +19,7 @@ #ifndef RTC_CHANNEL_H #define RTC_CHANNEL_H -#include "include.hpp" +#include "common.hpp" #include "message.hpp" #include diff --git a/include/rtc/include.hpp b/include/rtc/common.hpp similarity index 97% rename from include/rtc/include.hpp rename to include/rtc/common.hpp index b120fa8..b96ac7d 100644 --- a/include/rtc/include.hpp +++ b/include/rtc/common.hpp @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef RTC_INCLUDE_H -#define RTC_INCLUDE_H +#ifndef RTC_COMMON_H +#define RTC_COMMON_H #ifndef RTC_ENABLE_MEDIA #define RTC_ENABLE_MEDIA 1 diff --git a/include/rtc/configuration.hpp b/include/rtc/configuration.hpp index d37b663..84acb84 100644 --- a/include/rtc/configuration.hpp +++ b/include/rtc/configuration.hpp @@ -19,7 +19,7 @@ #ifndef RTC_ICE_CONFIGURATION_H #define RTC_ICE_CONFIGURATION_H -#include "include.hpp" +#include "common.hpp" #include "message.hpp" #include diff --git a/include/rtc/datachannel.hpp b/include/rtc/datachannel.hpp index e00ff3a..d3b1a36 100644 --- a/include/rtc/datachannel.hpp +++ b/include/rtc/datachannel.hpp @@ -20,7 +20,7 @@ #define RTC_DATA_CHANNEL_H #include "channel.hpp" -#include "include.hpp" +#include "common.hpp" #include "message.hpp" #include "queue.hpp" #include "reliability.hpp" diff --git a/include/rtc/description.hpp b/include/rtc/description.hpp index a09c91b..19f5b65 100644 --- a/include/rtc/description.hpp +++ b/include/rtc/description.hpp @@ -21,7 +21,7 @@ #define RTC_DESCRIPTION_H #include "candidate.hpp" -#include "include.hpp" +#include "common.hpp" #include #include diff --git a/include/rtc/init.hpp b/include/rtc/init.hpp index 2830d18..8325281 100644 --- a/include/rtc/init.hpp +++ b/include/rtc/init.hpp @@ -19,7 +19,7 @@ #ifndef RTC_INIT_H #define RTC_INIT_H -#include "include.hpp" +#include "common.hpp" #include diff --git a/include/rtc/log.hpp b/include/rtc/log.hpp index 56a2daf..e8b851f 100644 --- a/include/rtc/log.hpp +++ b/include/rtc/log.hpp @@ -35,7 +35,7 @@ #pragma warning(pop) #endif -#include "include.hpp" +#include "common.hpp" namespace rtc { diff --git a/include/rtc/mediahandler.hpp b/include/rtc/mediahandler.hpp index e9203f8..253c8ed 100644 --- a/include/rtc/mediahandler.hpp +++ b/include/rtc/mediahandler.hpp @@ -20,7 +20,7 @@ #ifndef RTC_MEDIA_HANDLER_H #define RTC_MEDIA_HANDLER_H -#include "include.hpp" +#include "common.hpp" #include "message.hpp" namespace rtc { diff --git a/include/rtc/mediahandlerelement.hpp b/include/rtc/mediahandlerelement.hpp index edf177c..2603150 100644 --- a/include/rtc/mediahandlerelement.hpp +++ b/include/rtc/mediahandlerelement.hpp @@ -20,7 +20,7 @@ #if RTC_ENABLE_MEDIA -#include "include.hpp" +#include "common.hpp" #include "message.hpp" #include "rtp.hpp" diff --git a/include/rtc/message.hpp b/include/rtc/message.hpp index 54fde3d..e1860b4 100644 --- a/include/rtc/message.hpp +++ b/include/rtc/message.hpp @@ -19,7 +19,7 @@ #ifndef RTC_MESSAGE_H #define RTC_MESSAGE_H -#include "include.hpp" +#include "common.hpp" #include "reliability.hpp" #include diff --git a/include/rtc/nalunit.hpp b/include/rtc/nalunit.hpp index 1012bf0..966b89c 100644 --- a/include/rtc/nalunit.hpp +++ b/include/rtc/nalunit.hpp @@ -21,7 +21,7 @@ #if RTC_ENABLE_MEDIA -#include "include.hpp" +#include "common.hpp" namespace rtc { diff --git a/include/rtc/peerconnection.hpp b/include/rtc/peerconnection.hpp index d0418de..2c61572 100644 --- a/include/rtc/peerconnection.hpp +++ b/include/rtc/peerconnection.hpp @@ -23,7 +23,7 @@ #include "configuration.hpp" #include "datachannel.hpp" #include "description.hpp" -#include "include.hpp" +#include "common.hpp" #include "init.hpp" #include "message.hpp" #include "reliability.hpp" diff --git a/include/rtc/queue.hpp b/include/rtc/queue.hpp index 1ffc41d..cdcc127 100644 --- a/include/rtc/queue.hpp +++ b/include/rtc/queue.hpp @@ -19,7 +19,7 @@ #ifndef RTC_QUEUE_H #define RTC_QUEUE_H -#include "include.hpp" +#include "common.hpp" #include #include diff --git a/include/rtc/reliability.hpp b/include/rtc/reliability.hpp index fc03a76..80e3fa0 100644 --- a/include/rtc/reliability.hpp +++ b/include/rtc/reliability.hpp @@ -19,7 +19,7 @@ #ifndef RTC_RELIABILITY_H #define RTC_RELIABILITY_H -#include "include.hpp" +#include "common.hpp" #include #include diff --git a/include/rtc/rtc.hpp b/include/rtc/rtc.hpp index e09b965..ec8b286 100644 --- a/include/rtc/rtc.hpp +++ b/include/rtc/rtc.hpp @@ -17,7 +17,7 @@ */ // C++ API -#include "include.hpp" +#include "common.hpp" #include "init.hpp" // for rtc::Cleanup() #include "log.hpp" // diff --git a/include/rtc/rtcpreceivingsession.hpp b/include/rtc/rtcpreceivingsession.hpp index 5ad31f5..47091d2 100644 --- a/include/rtc/rtcpreceivingsession.hpp +++ b/include/rtc/rtcpreceivingsession.hpp @@ -22,7 +22,7 @@ #if RTC_ENABLE_MEDIA -#include "include.hpp" +#include "common.hpp" #include "mediahandler.hpp" #include "message.hpp" #include "rtp.hpp" diff --git a/include/rtc/track.hpp b/include/rtc/track.hpp index 73195f3..1cc49b0 100644 --- a/include/rtc/track.hpp +++ b/include/rtc/track.hpp @@ -21,7 +21,7 @@ #include "channel.hpp" #include "description.hpp" -#include "include.hpp" +#include "common.hpp" #include "mediahandler.hpp" #include "message.hpp" #include "queue.hpp" diff --git a/include/rtc/websocket.hpp b/include/rtc/websocket.hpp index 92f9877..2fea8be 100644 --- a/include/rtc/websocket.hpp +++ b/include/rtc/websocket.hpp @@ -22,7 +22,7 @@ #if RTC_ENABLE_WEBSOCKET #include "channel.hpp" -#include "include.hpp" +#include "common.hpp" #include "init.hpp" #include "message.hpp" #include "queue.hpp" diff --git a/src/capi.cpp b/src/capi.cpp index f41373b..616344d 100644 --- a/src/capi.cpp +++ b/src/capi.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "include.hpp" +#include "common.hpp" #include "rtc.h" diff --git a/src/datachannel.cpp b/src/datachannel.cpp index 3b21a21..c48d10d 100644 --- a/src/datachannel.cpp +++ b/src/datachannel.cpp @@ -18,7 +18,7 @@ #include "datachannel.hpp" #include "globals.hpp" -#include "include.hpp" +#include "common.hpp" #include "peerconnection.hpp" #include "impl/datachannel.hpp" diff --git a/src/globals.hpp b/src/globals.hpp index f5b97a8..8dbf030 100644 --- a/src/globals.hpp +++ b/src/globals.hpp @@ -19,7 +19,7 @@ #ifndef RTC_GLOBALS_H #define RTC_GLOBALS_H -#include "include.hpp" +#include "common.hpp" namespace rtc { diff --git a/src/impl/base64.hpp b/src/impl/base64.hpp index d362102..fd3f1a6 100644 --- a/src/impl/base64.hpp +++ b/src/impl/base64.hpp @@ -21,7 +21,7 @@ #if RTC_ENABLE_WEBSOCKET -#include "include.hpp" +#include "common.hpp" namespace rtc::impl { diff --git a/src/impl/certificate.hpp b/src/impl/certificate.hpp index 610180d..631e8b9 100644 --- a/src/impl/certificate.hpp +++ b/src/impl/certificate.hpp @@ -19,7 +19,7 @@ #ifndef RTC_IMPL_CERTIFICATE_H #define RTC_IMPL_CERTIFICATE_H -#include "include.hpp" +#include "common.hpp" #include "tls.hpp" #include diff --git a/src/impl/channel.hpp b/src/impl/channel.hpp index 4329c63..87ca7e0 100644 --- a/src/impl/channel.hpp +++ b/src/impl/channel.hpp @@ -19,7 +19,7 @@ #ifndef RTC_IMPL_CHANNEL_H #define RTC_IMPL_CHANNEL_H -#include "include.hpp" +#include "common.hpp" #include "message.hpp" #include diff --git a/src/impl/datachannel.cpp b/src/impl/datachannel.cpp index af2479d..409c16a 100644 --- a/src/impl/datachannel.cpp +++ b/src/impl/datachannel.cpp @@ -18,7 +18,7 @@ #include "datachannel.hpp" #include "globals.hpp" -#include "include.hpp" +#include "common.hpp" #include "logcounter.hpp" #include "peerconnection.hpp" #include "sctptransport.hpp" diff --git a/src/impl/datachannel.hpp b/src/impl/datachannel.hpp index 9e6ffa3..4d8eb92 100644 --- a/src/impl/datachannel.hpp +++ b/src/impl/datachannel.hpp @@ -20,7 +20,7 @@ #define RTC_IMPL_DATA_CHANNEL_H #include "channel.hpp" -#include "include.hpp" +#include "common.hpp" #include "message.hpp" #include "peerconnection.hpp" #include "queue.hpp" diff --git a/src/impl/dtlssrtptransport.hpp b/src/impl/dtlssrtptransport.hpp index fa81d1d..631b91a 100644 --- a/src/impl/dtlssrtptransport.hpp +++ b/src/impl/dtlssrtptransport.hpp @@ -20,7 +20,7 @@ #define RTC_IMPL_DTLS_SRTP_TRANSPORT_H #include "dtlstransport.hpp" -#include "include.hpp" +#include "common.hpp" #if RTC_ENABLE_MEDIA diff --git a/src/impl/dtlstransport.hpp b/src/impl/dtlstransport.hpp index 9fea521..dd3dcd5 100644 --- a/src/impl/dtlstransport.hpp +++ b/src/impl/dtlstransport.hpp @@ -20,7 +20,7 @@ #define RTC_IMPL_DTLS_TRANSPORT_H #include "certificate.hpp" -#include "include.hpp" +#include "common.hpp" #include "queue.hpp" #include "tls.hpp" #include "transport.hpp" diff --git a/src/impl/icetransport.hpp b/src/impl/icetransport.hpp index 8efe01c..53fa784 100644 --- a/src/impl/icetransport.hpp +++ b/src/impl/icetransport.hpp @@ -22,7 +22,7 @@ #include "candidate.hpp" #include "configuration.hpp" #include "description.hpp" -#include "include.hpp" +#include "common.hpp" #include "peerconnection.hpp" #include "transport.hpp" diff --git a/src/impl/logcounter.hpp b/src/impl/logcounter.hpp index c40a251..3b494b6 100644 --- a/src/impl/logcounter.hpp +++ b/src/impl/logcounter.hpp @@ -19,7 +19,7 @@ #ifndef RTC_SERVER_LOGCOUNTER_HPP #define RTC_SERVER_LOGCOUNTER_HPP -#include "include.hpp" +#include "common.hpp" #include "threadpool.hpp" #include diff --git a/src/impl/peerconnection.cpp b/src/impl/peerconnection.cpp index ab7c9a8..106e278 100644 --- a/src/impl/peerconnection.cpp +++ b/src/impl/peerconnection.cpp @@ -22,7 +22,7 @@ #include "dtlstransport.hpp" #include "globals.hpp" #include "icetransport.hpp" -#include "include.hpp" +#include "common.hpp" #include "logcounter.hpp" #include "peerconnection.hpp" #include "processor.hpp" diff --git a/src/impl/peerconnection.hpp b/src/impl/peerconnection.hpp index 8515951..a85a5cd 100644 --- a/src/impl/peerconnection.hpp +++ b/src/impl/peerconnection.hpp @@ -22,7 +22,7 @@ #include "datachannel.hpp" #include "dtlstransport.hpp" #include "icetransport.hpp" -#include "include.hpp" +#include "common.hpp" #include "sctptransport.hpp" #include "track.hpp" diff --git a/src/impl/processor.hpp b/src/impl/processor.hpp index ba61cc0..778d708 100644 --- a/src/impl/processor.hpp +++ b/src/impl/processor.hpp @@ -19,7 +19,7 @@ #ifndef RTC_IMPL_PROCESSOR_H #define RTC_IMPL_PROCESSOR_H -#include "include.hpp" +#include "common.hpp" #include "init.hpp" #include "queue.hpp" #include "threadpool.hpp" diff --git a/src/impl/sctptransport.hpp b/src/impl/sctptransport.hpp index b7cff84..e2ea74e 100644 --- a/src/impl/sctptransport.hpp +++ b/src/impl/sctptransport.hpp @@ -19,7 +19,7 @@ #ifndef RTC_IMPL_SCTP_TRANSPORT_H #define RTC_IMPL_SCTP_TRANSPORT_H -#include "include.hpp" +#include "common.hpp" #include "processor.hpp" #include "queue.hpp" #include "transport.hpp" diff --git a/src/impl/tcptransport.hpp b/src/impl/tcptransport.hpp index 1450743..f091fa2 100644 --- a/src/impl/tcptransport.hpp +++ b/src/impl/tcptransport.hpp @@ -19,7 +19,7 @@ #ifndef RTC_IMPL_TCP_TRANSPORT_H #define RTC_IMPL_TCP_TRANSPORT_H -#include "include.hpp" +#include "common.hpp" #include "queue.hpp" #include "transport.hpp" diff --git a/src/impl/threadpool.hpp b/src/impl/threadpool.hpp index 0232ac8..d312b1a 100644 --- a/src/impl/threadpool.hpp +++ b/src/impl/threadpool.hpp @@ -19,7 +19,7 @@ #ifndef RTC_IMPL_THREADPOOL_H #define RTC_IMPL_THREADPOOL_H -#include "include.hpp" +#include "common.hpp" #include "init.hpp" #include diff --git a/src/impl/tls.hpp b/src/impl/tls.hpp index 8a2e150..da94e1a 100644 --- a/src/impl/tls.hpp +++ b/src/impl/tls.hpp @@ -19,7 +19,7 @@ #ifndef RTC_TLS_H #define RTC_TLS_H -#include "include.hpp" +#include "common.hpp" #if USE_GNUTLS diff --git a/src/impl/tlstransport.hpp b/src/impl/tlstransport.hpp index 7807ac5..8810572 100644 --- a/src/impl/tlstransport.hpp +++ b/src/impl/tlstransport.hpp @@ -19,7 +19,7 @@ #ifndef RTC_IMPL_TLS_TRANSPORT_H #define RTC_IMPL_TLS_TRANSPORT_H -#include "include.hpp" +#include "common.hpp" #include "queue.hpp" #include "tls.hpp" #include "transport.hpp" diff --git a/src/impl/track.hpp b/src/impl/track.hpp index fb95ac0..57dd771 100644 --- a/src/impl/track.hpp +++ b/src/impl/track.hpp @@ -21,7 +21,7 @@ #include "channel.hpp" #include "description.hpp" -#include "include.hpp" +#include "common.hpp" #include "mediahandler.hpp" #if RTC_ENABLE_MEDIA diff --git a/src/impl/transport.hpp b/src/impl/transport.hpp index a554b6e..fb68d1e 100644 --- a/src/impl/transport.hpp +++ b/src/impl/transport.hpp @@ -19,7 +19,7 @@ #ifndef RTC_IMPL_TRANSPORT_H #define RTC_IMPL_TRANSPORT_H -#include "include.hpp" +#include "common.hpp" #include "message.hpp" #include diff --git a/src/impl/verifiedtlstransport.cpp b/src/impl/verifiedtlstransport.cpp index f5c14b9..b214822 100644 --- a/src/impl/verifiedtlstransport.cpp +++ b/src/impl/verifiedtlstransport.cpp @@ -17,7 +17,7 @@ */ #include "verifiedtlstransport.hpp" -#include "include.hpp" +#include "common.hpp" #if RTC_ENABLE_WEBSOCKET diff --git a/src/impl/websocket.cpp b/src/impl/websocket.cpp index f540388..47d1b3d 100644 --- a/src/impl/websocket.cpp +++ b/src/impl/websocket.cpp @@ -20,7 +20,7 @@ #include "websocket.hpp" #include "globals.hpp" -#include "include.hpp" +#include "common.hpp" #include "threadpool.hpp" #include "tcptransport.hpp" diff --git a/src/impl/websocket.hpp b/src/impl/websocket.hpp index 0443bbd..66b63a9 100644 --- a/src/impl/websocket.hpp +++ b/src/impl/websocket.hpp @@ -22,7 +22,7 @@ #if RTC_ENABLE_WEBSOCKET #include "channel.hpp" -#include "include.hpp" +#include "common.hpp" #include "init.hpp" #include "message.hpp" #include "queue.hpp" diff --git a/src/impl/wstransport.hpp b/src/impl/wstransport.hpp index 5f1f8bd..c3e915a 100644 --- a/src/impl/wstransport.hpp +++ b/src/impl/wstransport.hpp @@ -19,7 +19,7 @@ #ifndef RTC_IMPL_WS_TRANSPORT_H #define RTC_IMPL_WS_TRANSPORT_H -#include "include.hpp" +#include "common.hpp" #include "transport.hpp" #if RTC_ENABLE_WEBSOCKET diff --git a/src/peerconnection.cpp b/src/peerconnection.cpp index 4106b73..1fc288e 100644 --- a/src/peerconnection.cpp +++ b/src/peerconnection.cpp @@ -18,7 +18,7 @@ */ #include "peerconnection.hpp" -#include "include.hpp" +#include "common.hpp" #include "rtp.hpp" #include "impl/certificate.hpp" diff --git a/src/websocket.cpp b/src/websocket.cpp index 62089c7..fc2936f 100644 --- a/src/websocket.cpp +++ b/src/websocket.cpp @@ -20,7 +20,7 @@ #include "websocket.hpp" #include "globals.hpp" -#include "include.hpp" +#include "common.hpp" #include "impl/websocket.hpp"