AnotherFoxGuy/webrtc-audio-processing
1
0
Fork 0
Code Pull Requests Activity

Some fixes for MinGW

Browse Source 
* Rename Windows.h uses to windows.h
  * Comment out structured exception handling usage

Makes MinGW happier. Mostly the same as previous work by
Nicolas Dufresne <nicolas.dufresne@collabora.com>, with the exception
that we now don't try to invoke RaiseException which would fail in MinGW
as it raises a Windows structured exception.
This commit is contained in:
Arun Raghavan 2021-06-18 18:40:32 -04:00
parent f8a6ea0a9a
commit a9f97c9fdd
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/rtc_base/platform_thread_types.cc
View File

@ -118,11 +118,13 @@ void SetCurrentThreadName(const char* name) {
#pragma warning(push) #pragma warning(push)
#pragma warning(disable : 6320 6322) #pragma warning(disable : 6320 6322)
#ifndef __MINGW32__
__try { __try {
::RaiseException(0x406D1388, 0, sizeof(threadname_info) / sizeof(ULONG_PTR), ::RaiseException(0x406D1388, 0, sizeof(threadname_info) / sizeof(ULONG_PTR),
reinterpret_cast<ULONG_PTR*>(&threadname_info)); reinterpret_cast<ULONG_PTR*>(&threadname_info));
} __except (EXCEPTION_EXECUTE_HANDLER) { // NOLINT } __except (EXCEPTION_EXECUTE_HANDLER) { // NOLINT
} }
#endif
#pragma warning(pop) #pragma warning(pop)
#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) #elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)
prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name)); // NOLINT prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name)); // NOLINT

2
webrtc/rtc_base/system/file_wrapper.cc
View File

@ -22,7 +22,7 @@
#include "rtc_base/numerics/safe_conversions.h" #include "rtc_base/numerics/safe_conversions.h"
#ifdef _WIN32 #ifdef _WIN32
#include <Windows.h> #include <windows.h>
#else #else
#endif #endif