[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[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)

Title: GitLab

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:

Changes:

  • third_party/libwebrtc/modules/desktop_capture/desktop_capture_types.h
    ... ... @@ -11,22 +11,15 @@
    11 11 
     #ifndef MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_TYPES_H_
    12 12 
     #define MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_TYPES_H_
    13 13
    14 
    -#ifndef XP_WIN
    15 
    -#include <sys/types.h> // pid_t
    16 
    -#endif
    17 
    -#include <stdint.h>
    18 
    -
    19 
    -// Use int on all clang-cl builds and x86 mingw builds.
    20 
    -// Use long long on Windows x64 building under MinGW
    21 
    -// Must be consistent with the same typedefs in video_capture_defines.h
    22 
    -#if defined(XP_WIN)
    23 
    -#if defined(_MSC_VER) || !defined(_WIN64)
    24 
    -typedef int pid_t;
    14 
    +// pid_t
    15 
    +#if !defined(XP_WIN) || defined(__MINGW32__)
    16 
    +#include <sys/types.h>
    25 17 
     #else
    26 
    -typedef long long pid_t;
    27 
    -#endif
    18 
    +typedef int pid_t;
    28 19 
     #endif
    29 20
    21 
    +#include <stdint.h>
    22 
    +
    30 23 
     namespace webrtc {
    31 24
    32 25 
     // 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 @@
    14 14 
     #include "api/video/video_frame.h"
    15 15 
     #include "common_video/libyuv/include/webrtc_libyuv.h"
    16 16
    17 
    -// Use int on all clang-cl builds and x86 mingw builds.
    18 
    -// Use long long on Windows x64 building under MinGW
    19 
    -// Must be consistent with the same typedefs in desktop_capture_types.h
    20 
    -#if defined(XP_WIN)
    21 
    -#if defined(_MSC_VER) || !defined(_WIN64)
    22 
    -typedef int pid_t;
    23 
    -#else
    24 
    -typedef long long pid_t;
    25 
    -#endif
    26 
    -#endif
    27 
    -
    28 17 
     namespace webrtc {
    29 18
    30 19 
     enum {

  • third_party/sipcc/cpr_win_types.h
    ... ... @@ -50,14 +50,10 @@ typedef int64_t ssize_t;
    50 50 
     #endif
    51 51
    52 52 
     /*
    53 
    - * Define pid_t.
    53 
    + * Define pid_t for MSVC builds
    54 54 
      */
    55 
    -#if defined(_WIN32)
    56 
    -#if defined(_MSC_VER) || !defined(_WIN64)
    55 
    +#if defined(_WIN32) && defined (_MSC_VER)
    57 56 
     typedef int pid_t;
    58 
    -#else
    59 
    -typedef long long pid_t;
    60 
    -#endif
    61 57 
     #endif
    62 58
    63 59 
     /*

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits