commit d7b9131de49213c8dac754f1092b26c408311329
author Niels Möller <nisse@webrtc.org> Thu May 24 09:21:34 2018
committer Commit Bot <commit-bot@chromium.org> Thu May 24 11:17:30 2018
tree a82b756ca95ce9bc90aeb617e7e6944d31cd434a
parent 9c26a0fb00594e3c129bb0a6a7fec5789e344816

Move socklen_t definition for windows to win32.h.

Bug: webrtc:6853
Change-Id: Ie73cd959707b32b928acdabd46329830b2bb2c27
Reviewed-on: https://webrtc-review.googlesource.com/78720
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23381}

rtc_base/basictypes.h

diff --git a/rtc_base/basictypes.h b/rtc_base/basictypes.h
index 44307319..1d149d6 100644
--- a/rtc_base/basictypes.h
+++ b/rtc_base/basictypes.h
@@ -42,8 +42,4 @@
 #error RTC_ARCH_CPU_BIG_ENDIAN and RTC_ARCH_CPU_LITTLE_ENDIAN both defined.
 #endif
 
-#if defined(WEBRTC_WIN)
-typedef int socklen_t;
-#endif
-
 #endif  // RTC_BASE_BASICTYPES_H_

rtc_base/network.cc

diff --git a/rtc_base/network.cc b/rtc_base/network.cc
index e857e75..ca19881 100644
--- a/rtc_base/network.cc
+++ b/rtc_base/network.cc
@@ -40,6 +40,7 @@
 #include "rtc_base/socket.h"  // includes something that makes windows happy
 #include "rtc_base/stream.h"
 #include "rtc_base/stringencode.h"
+#include "rtc_base/stringutils.h"
 #include "rtc_base/thread.h"
 
 namespace rtc {

rtc_base/win32.cc

diff --git a/rtc_base/win32.cc b/rtc_base/win32.cc
index 1c5585b..86f8352 100644
--- a/rtc_base/win32.cc
+++ b/rtc_base/win32.cc
@@ -18,6 +18,7 @@
 #include "rtc_base/byteorder.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/stringutils.h"
 
 namespace rtc {
 

rtc_base/win32.h

diff --git a/rtc_base/win32.h b/rtc_base/win32.h
index 4e91687..b20f3f3 100644
--- a/rtc_base/win32.h
+++ b/rtc_base/win32.h
@@ -27,6 +27,8 @@
 #include <winsock2.h>
 #include <windows.h>
 
+typedef int socklen_t;
+
 #ifndef SECURITY_MANDATORY_LABEL_AUTHORITY
 // Add defines that we use if we are compiling against older sdks
 #define SECURITY_MANDATORY_MEDIUM_RID               (0x00002000L)
@@ -40,9 +42,6 @@
 
 #include <string>
 
-#include "rtc_base/basictypes.h"
-#include "rtc_base/stringutils.h"
-
 namespace rtc {
 
 const char* win32_inet_ntop(int af, const void *src, char* dst, socklen_t size);