1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
From: Nico Grunbaum <na-g@nostrum.com>
Date: Thu, 23 May 2024 17:28:00 +0000
Subject: Bug 1897459 - P2 - for BSD reference null socket server
instead;r=mjf,webrtc-reviewers
Differential Revision: https://phabricator.services.mozilla.com/D211095
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/0993ae41fb7db1624dedc5cf2278cd5a505f18f5
---
rtc_base/internal/default_socket_server.cc | 4 ++--
rtc_base/virtual_socket_server.cc | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/rtc_base/internal/default_socket_server.cc b/rtc_base/internal/default_socket_server.cc
index 043c2ce850..18049906e9 100644
--- a/rtc_base/internal/default_socket_server.cc
+++ b/rtc_base/internal/default_socket_server.cc
@@ -14,7 +14,7 @@
#include "rtc_base/socket_server.h"
-#if defined(__native_client__)
+#if defined(__native_client__) || defined(WEBRTC_BSD)
#include "rtc_base/null_socket_server.h"
#else
#include "rtc_base/physical_socket_server.h"
@@ -23,7 +23,7 @@
namespace webrtc {
std::unique_ptr<SocketServer> CreateDefaultSocketServer() {
-#if defined(__native_client__)
+#if defined(__native_client__) || defined(WEBRTC_BSD)
return std::unique_ptr<SocketServer>(new webrtc::NullSocketServer);
#else
return std::unique_ptr<SocketServer>(new PhysicalSocketServer);
diff --git a/rtc_base/virtual_socket_server.cc b/rtc_base/virtual_socket_server.cc
index 9fad9dfe27..3a5b2a48cc 100644
--- a/rtc_base/virtual_socket_server.cc
+++ b/rtc_base/virtual_socket_server.cc
@@ -24,7 +24,9 @@
#include "rtc_base/event.h"
#include "rtc_base/fake_clock.h"
#include "rtc_base/logging.h"
+#if !defined(WEBRTC_BSD)
#include "rtc_base/physical_socket_server.h"
+#endif
#include "rtc_base/socket_address_pair.h"
#include "rtc_base/thread.h"
#include "rtc_base/time_utils.h"
|
