Fixed mozilla#1533969 patch

This commit is contained in:
Martin Stransky 2019-03-22 15:20:25 +01:00
parent 53a4c34c5d
commit f7815c33e4

View File

@ -1,6 +1,6 @@
diff --git a/js/src/util/NativeStack.cpp b/js/src/util/NativeStack.cpp
--- a/js/src/util/NativeStack.cpp
+++ b/js/src/util/NativeStack.cpp
diff -up firefox-66.0/js/src/util/NativeStack.cpp.mozilla-1533969 firefox-66.0/js/src/util/NativeStack.cpp
--- firefox-66.0/js/src/util/NativeStack.cpp.mozilla-1533969 2019-03-14 23:12:13.000000000 +0100
+++ firefox-66.0/js/src/util/NativeStack.cpp 2019-03-22 15:17:08.338328211 +0100
@@ -25,7 +25,7 @@
# include <sys/syscall.h>
# include <sys/types.h>
@ -10,16 +10,10 @@ diff --git a/js/src/util/NativeStack.cpp b/js/src/util/NativeStack.cpp
# endif
#else
# error "Unsupported platform"
diff --git a/tools/profiler/core/platform.h b/tools/profiler/core/platform.h
--- a/tools/profiler/core/platform.h
+++ b/tools/profiler/core/platform.h
@@ -39,16 +39,16 @@
#include <functional>
#include <stdint.h>
-// We need a definition of gettid(), but glibc doesn't provide a
+// We need a definition of gettid(), but old glibc versions don't provide a
// wrapper for it.
diff -up firefox-66.0/tools/profiler/core/platform.h.mozilla-1533969 firefox-66.0/tools/profiler/core/platform.h
--- firefox-66.0/tools/profiler/core/platform.h.mozilla-1533969 2019-03-22 15:17:08.338328211 +0100
+++ firefox-66.0/tools/profiler/core/platform.h 2019-03-22 15:19:00.046748130 +0100
@@ -47,11 +47,11 @@
#if defined(__GLIBC__)
# include <unistd.h>
# include <sys/syscall.h>
@ -33,4 +27,3 @@ diff --git a/tools/profiler/core/platform.h b/tools/profiler/core/platform.h
#elif defined(GP_OS_android)
# include <unistd.h>
#elif defined(GP_OS_windows)