2
0
mirror of https://codeberg.org/kiss-community/repo synced 2024-12-23 07:40:11 -07:00

firefox-esr: Fix patch

This commit is contained in:
Dylan Araps 2020-01-13 19:53:40 +02:00
parent 6de518f6da
commit d0c8db9409
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
2 changed files with 16 additions and 24 deletions

View File

@ -7,5 +7,5 @@ b5e70b12cc9dd18fffd7924a7d3a2e11574136fe0764359d08eba0755f1c5d4c mozconfig
b19aaae7fc45db643f8d2540d96919c745ea341e36d9aea2df40e3e90eb951f0 fix-toolkit.patch b19aaae7fc45db643f8d2540d96919c745ea341e36d9aea2df40e3e90eb951f0 fix-toolkit.patch
e24f71a6a0d8d4637b2081780c66b01be4eeb4dd496031270d0ae0b898be94d2 fix-tools.patch e24f71a6a0d8d4637b2081780c66b01be4eeb4dd496031270d0ae0b898be94d2 fix-tools.patch
5e0fcfde375837074baad21a8ab26aa442a7940617ebd074a6b238a48f2ceb63 fix-webrtc-glibcisms.patch 5e0fcfde375837074baad21a8ab26aa442a7940617ebd074a6b238a48f2ceb63 fix-webrtc-glibcisms.patch
800965f5071d6f84ca99382f1ffd41b0683e3e9e704acbd415923a8b2d209761 fix-bug-1261392.patch 3e415de9a028c72833aaf58f72b5bf078bffcc3478fd50754998346154016afa fix-bug-1261392.patch
1d4a8f110d34da478f5597727eda9acacebd443dd86cce5bb64f898c01feabce mallinfo.patch 1d4a8f110d34da478f5597727eda9acacebd443dd86cce5bb64f898c01feabce mallinfo.patch

View File

@ -1,25 +1,17 @@
--- a/tools/profiler/core/platform.h 2017-05-27 11:44:06.733119794 +0000 diff --git a/tools/profiler/core/platform-linux-android.cpp b/tools/profiler/core/platform-linux-android.cpp
+++ b/tools/profiler/core/platform.h 2017-05-27 11:46:16.004253520 +0000 index 07857f2..92e693c 100644
@@ -54,10 +54,11 @@ --- a/tools/profiler/core/platform-linux-android.cpp
#include <vector> +++ b/tools/profiler/core/platform-linux-android.cpp
#include "StackTop.h" @@ -72,12 +72,7 @@ using namespace mozilla;
int profiler_current_process_id() { return getpid(); }
-// We need a definition of gettid(), but old glibc versions don't provide a int profiler_current_thread_id() {
-// wrapper for it. - // glibc doesn't provide a wrapper for gettid().
-#if defined(__GLIBC__) -#if defined(__GLIBC__)
+// We need a definition of gettid(), but Linux libc implementations don't return static_cast<int>(static_cast<pid_t>(syscall(SYS_gettid)));
+// provide a wrapper for it (except for Bionic) -#else
+#if defined(__linux__) - return static_cast<int>(gettid());
# include <unistd.h> -#endif
+#if !defined(__BIONIC__)
# include <sys/syscall.h>
# define gettid() static_cast<pid_t>(syscall(SYS_gettid))
+#endif
@@ -71,6 +72,7 @@
return (pid_t) syscall(SYS_thread_selfid);
} }
#endif
+#endif
#ifdef XP_WIN void* GetStackTop(void* aGuess) { return aGuess; }
#include <windows.h>