fixup! Bug 41459: WebRTC fails to build under mingw (Part 2)

third_party/libwebrtc/modules/desktop_capture/desktop_capture_types.h

@@ -11,22 +11,15 @@
 #ifndef MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_TYPES_H_
 #define MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_TYPES_H_
 
-#ifndef XP_WIN
-#include <sys/types.h> // pid_t
-#endif
-#include <stdint.h>
-
-// Use int on all clang-cl builds and x86 mingw builds.
-// Use long long on Windows x64 building under MinGW
-// Must be consistent with the same typedefs in video_capture_defines.h
-#if defined(XP_WIN)
-#if defined(_MSC_VER) || !defined(_WIN64)
-typedef int pid_t;
+// pid_t
+#if !defined(XP_WIN) || defined(__MINGW32__)
+#include <sys/types.h>
 #else
-typedef long long pid_t;
-#endif
+typedef int pid_t;
 #endif
 
+#include <stdint.h>
+
 namespace webrtc {
 
 // Type used to identify windows on the desktop. Values are platform-specific:

third_party/libwebrtc/modules/video_capture/video_capture_defines.h

@@ -14,17 +14,6 @@
 #include "api/video/video_frame.h"
 #include "common_video/libyuv/include/webrtc_libyuv.h"
 
-// Use int on all clang-cl builds and x86 mingw builds.
-// Use long long on Windows x64 building under MinGW
-// Must be consistent with the same typedefs in desktop_capture_types.h
-#if defined(XP_WIN)
-#if defined(_MSC_VER) || !defined(_WIN64)
-typedef int pid_t;
-#else
-typedef long long pid_t;
-#endif
-#endif
-
 namespace webrtc {
 
 enum {