[tor-commits] [Git][tpo/applications/tor-browser][base-browser-102.9.0esr-12.5-1] 2 commits: fixup! Bug 41459: WebRTC fails to build under mingw (Part 2)

[Richard Pospesel (@richard)]

Richard Pospesel pushed to branch base-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser


Commits:
0a233469 by Richard Pospesel at 2023-03-13T19:01:26+00:00
fixup! Bug 41459: WebRTC fails to build under mingw (Part 2)

- - - - -
e247c93c by Richard Pospesel at 2023-03-13T19:01:31+00:00
fixup! Bug 41459: WebRTC fails to build under mingw (Part 3)

- - - - -


3 changed files:

- third_party/libwebrtc/modules/desktop_capture/desktop_capture_types.h
- third_party/libwebrtc/modules/video_capture/video_capture_defines.h
- third_party/sipcc/cpr_win_types.h


Changes:

=====================================
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 {


=====================================
third_party/sipcc/cpr_win_types.h
=====================================
@@ -50,14 +50,10 @@ typedef int64_t ssize_t;
 #endif
 
 /*
- * Define pid_t.
+ * Define pid_t for MSVC builds
  */
-#if defined(_WIN32)
-#if defined(_MSC_VER) || !defined(_WIN64)
+#if defined(_WIN32) && defined (_MSC_VER)
 typedef int pid_t;
-#else
-typedef long long pid_t;
-#endif
 #endif
 
 /*



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/1d8ac663544b47d02bf54688d01fd17f6906e74a...e247c93c31e7ea4268ef64aa39ff16edcff15ada

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/1d8ac663544b47d02bf54688d01fd17f6906e74a...e247c93c31e7ea4268ef64aa39ff16edcff15ada
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20230314/58042a04/attachment-0001.htm>