diff options
Diffstat (limited to 'testing/firefox/fix-tools.patch')
| -rw-r--r-- | testing/firefox/fix-tools.patch | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/testing/firefox/fix-tools.patch b/testing/firefox/fix-tools.patch index 86185870f0..cf1589d633 100644 --- a/testing/firefox/fix-tools.patch +++ b/testing/firefox/fix-tools.patch @@ -1,7 +1,7 @@ diff --git a/tools/profiler/LulElf.cpp b/tools/profiler/LulElf.cpp index 203b15d..08a270a 100644 ---- a/tools/profiler/LulElf.cpp -+++ b/tools/profiler/LulElf.cpp +--- a/tools/profiler/lul/LulElf.cpp ++++ b/tools/profiler/lul/LulElf.cpp @@ -612,10 +612,10 @@ string FormatIdentifier(unsigned char identifier[16]) { // Return the non-directory portion of FILENAME: the portion after the // last slash, or the whole filename if there are no slashes. @@ -19,8 +19,8 @@ index 203b15d..08a270a 100644 diff --git a/tools/profiler/local_debug_info_symbolizer.cc b/tools/profiler/local_debug_info_symbolizer.cc index 2232130..41dabc8 100644 ---- a/tools/profiler/local_debug_info_symbolizer.cc -+++ b/tools/profiler/local_debug_info_symbolizer.cc +--- a/tools/profiler/gecko/local_debug_info_symbolizer.cc ++++ b/tools/profiler/gecko/local_debug_info_symbolizer.cc @@ -3,6 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -29,11 +29,18 @@ index 2232130..41dabc8 100644 #include "PlatformMacros.h" #include "nsAutoPtr.h" -diff --git a/tools/profiler/platform-linux-lul.h b/tools/profiler/platform-linux-lul.h -index 64714aa..563d8c0 100644 ---- a/tools/profiler/platform-linux-lul.h -+++ b/tools/profiler/platform-linux-lul.h -@@ -18,7 +18,7 @@ logging_sink_for_LUL(const char* str); +--- ./tools/profiler/core/platform.h.orig ++++ ./tools/profiler/core/platform.h +@@ -34,6 +34,8 @@ + #define MOZ_COUNT_DTOR(name) + #endif + ++#include <sys/types.h> ++ + #ifdef ANDROID + #include <android/log.h> + #else +@@ -60,7 +62,7 @@ // We need a definition of gettid(), but glibc doesn't provide a // wrapper for it. @@ -42,16 +49,3 @@ index 64714aa..563d8c0 100644 #include <unistd.h> #include <sys/syscall.h> static inline pid_t gettid() -diff --git a/tools/profiler/platform.h b/tools/profiler/platform.h -index bb938a4..c721926 100644 ---- a/tools/profiler/platform.h -+++ b/tools/profiler/platform.h -@@ -29,6 +29,8 @@ - #ifndef TOOLS_PLATFORM_H_ - #define TOOLS_PLATFORM_H_ - -+#include <sys/types.h> -+ - #ifdef ANDROID - #include <android/log.h> - #else |