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}

examples/peerconnection/client/main_wnd.cc

@@ -17,6 +17,7 @@
 #include "rtc_base/arraysize.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/stringutils.h"
 #include "third_party/libyuv/include/libyuv/convert_argb.h"
 
 ATOM MainWnd::wnd_class_ = 0;

modules/desktop_capture/win/dxgi_output_duplicator.cc

@@ -23,6 +23,7 @@
 #include "modules/desktop_capture/win/dxgi_texture_staging.h"
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/stringutils.h"
 #include "rtc_base/win32.h"
 
 namespace webrtc {

modules/desktop_capture/win/screen_capture_utils.cc

@@ -17,6 +17,7 @@
 
 #include "modules/desktop_capture/desktop_capturer.h"
 #include "rtc_base/checks.h"
+#include "rtc_base/stringutils.h"
 #include "rtc_base/win32.h"
 
 namespace webrtc {

modules/desktop_capture/window_capturer_win.cc

@@ -20,6 +20,7 @@
 #include "rtc_base/checks.h"
 #include "rtc_base/constructormagic.h"
 #include "rtc_base/logging.h"
+#include "rtc_base/stringutils.h"
 #include "rtc_base/trace_event.h"
 #include "rtc_base/win32.h"
 

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

@@ -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

@@ -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

@@ -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 @@ typedef struct _TOKEN_MANDATORY_LABEL {
 
 #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);

test/testsupport/fileutils.cc

@@ -43,6 +43,7 @@
 #include <utility>
 
 #include "rtc_base/checks.h"
+#include "rtc_base/stringutils.h"
 #include "typedefs.h"  // NOLINT(build/include)  // For architecture defines
 
 namespace webrtc {