Fix circular dependencies between optional, array_view, and rtc_base.
This splits things out of rtc_base and makes dependencies explicit. Bug: webrtc:6828 Change-Id: Ib813c7bd9e4de7ab015acb917bc09ee7204ba7bd Reviewed-on: https://webrtc-review.googlesource.com/31940 Commit-Queue: Patrik Höglund <phoglund@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Cr-Commit-Position: refs/heads/master@{#21245}
This commit is contained in:

committed by
Commit Bot

parent
10a8e7a9b5
commit
a9e0924fa7
@ -19,7 +19,6 @@
|
||||
|
||||
#if defined(WEBRTC_POSIX)
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#if defined(WEBRTC_USE_EPOLL)
|
||||
// "poll" will be used to wait for the signal dispatcher.
|
||||
@ -40,6 +39,8 @@
|
||||
#undef SetPort
|
||||
#endif
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <map>
|
||||
|
||||
@ -53,6 +54,17 @@
|
||||
#include "rtc_base/timeutils.h"
|
||||
#include "rtc_base/win32socketinit.h"
|
||||
|
||||
#if defined(WEBRTC_WIN)
|
||||
#define RTC_LAST_SYSTEM_ERROR \
|
||||
(::GetLastError())
|
||||
#elif defined(__native_client__) && __native_client__
|
||||
#define RTC_LAST_SYSTEM_ERROR \
|
||||
(0)
|
||||
#elif defined(WEBRTC_POSIX)
|
||||
#define RTC_LAST_SYSTEM_ERROR \
|
||||
(errno)
|
||||
#endif // WEBRTC_WIN
|
||||
|
||||
#if defined(WEBRTC_POSIX)
|
||||
#include <netinet/tcp.h> // for TCP_NODELAY
|
||||
#define IP_MTU 14 // Until this is integrated from linux/in.h to netinet/in.h
|
||||
|
Reference in New Issue
Block a user