Browse Source

Fixed compilation with libnice

Paul-Louis Ageneau 4 years ago
parent
commit
e37bea360d
1 changed files with 5 additions and 8 deletions
  1. 5 8
      src/impl/icetransport.cpp

+ 5 - 8
src/impl/icetransport.cpp

@@ -18,6 +18,7 @@
 
 
 #include "icetransport.hpp"
 #include "icetransport.hpp"
 #include "configuration.hpp"
 #include "configuration.hpp"
+#include "globals.hpp"
 #include "transport.hpp"
 #include "transport.hpp"
 
 
 #include <iostream>
 #include <iostream>
@@ -39,12 +40,12 @@
 using namespace std::chrono_literals;
 using namespace std::chrono_literals;
 using std::chrono::system_clock;
 using std::chrono::system_clock;
 
 
+namespace rtc::impl {
+
 #if !USE_NICE
 #if !USE_NICE
 
 
 #define MAX_TURN_SERVERS_COUNT 2
 #define MAX_TURN_SERVERS_COUNT 2
 
 
-namespace rtc::impl {
-
 IceTransport::IceTransport(const Configuration &config, candidate_callback candidateCallback,
 IceTransport::IceTransport(const Configuration &config, candidate_callback candidateCallback,
                            state_callback stateChangeCallback,
                            state_callback stateChangeCallback,
                            gathering_state_callback gatheringStateChangeCallback)
                            gathering_state_callback gatheringStateChangeCallback)
@@ -338,12 +339,8 @@ void IceTransport::LogCallback(juice_log_level_t level, const char *message) {
 	PLOG(severity) << "juice: " << message;
 	PLOG(severity) << "juice: " << message;
 }
 }
 
 
-} // namespace rtc::impl
-
 #else // USE_NICE == 1
 #else // USE_NICE == 1
 
 
-namespace rtc {
-
 IceTransport::IceTransport(const Configuration &config, candidate_callback candidateCallback,
 IceTransport::IceTransport(const Configuration &config, candidate_callback candidateCallback,
                            state_callback stateChangeCallback,
                            state_callback stateChangeCallback,
                            gathering_state_callback gatheringStateChangeCallback)
                            gathering_state_callback gatheringStateChangeCallback)
@@ -808,6 +805,6 @@ bool IceTransport::getSelectedCandidatePair(Candidate *local, Candidate *remote)
 	return true;
 	return true;
 }
 }
 
 
-} // namespace rtc
-
 #endif
 #endif
+
+} // namespace rtc::impl