diff options
Diffstat (limited to 'community/chromium/musl-fixes.patch')
| -rw-r--r-- | community/chromium/musl-fixes.patch | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/community/chromium/musl-fixes.patch b/community/chromium/musl-fixes.patch index 62692503fb..4282a17f33 100644 --- a/community/chromium/musl-fixes.patch +++ b/community/chromium/musl-fixes.patch @@ -128,47 +128,45 @@ #include <unistd.h> --- ./third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig +++ ./third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp -@@ -58,7 +58,7 @@ - // FIXME: On Mac OSX and Linux, this method cannot estimate stack size - // correctly for the main thread. +@@ -68,7 +68,7 @@ + // FIXME: On Mac OSX and Linux, this method cannot estimate stack size + // correctly for the main thread. -#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) +#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) - // pthread_getattr_np() can fail if the thread is not invoked by - // pthread_create() (e.g., the main thread of webkit_unit_tests). - // In this case, this method returns 0 and the caller must handle it. -@@ -105,7 +105,7 @@ + // pthread_getattr_np() can fail if the thread is not invoked by + // pthread_create() (e.g., the main thread of webkit_unit_tests). + // If so, a conservative size estimate is returned. +@@ -135,7 +135,7 @@ + } - void* StackFrameDepth::getStackStart() - { + void* StackFrameDepth::getStackStart() { -#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) +#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD) - pthread_attr_t attr; - int error; + pthread_attr_t attr; + int error; #if OS(FREEBSD) --- ./chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig +++ ./chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -26,7 +26,7 @@ - #include "ui/events/event_switches.h" - #include "ui/gfx/screen.h" +@@ -40,7 +40,7 @@ + #include "chrome/browser/metrics/tab_usage_recorder.h" + #endif // !defined(OS_ANDROID) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(__GLIBC__) && !defined(OS_CHROMEOS) #include <gnu/libc-version.h> #include "base/version.h" ---- ./chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig -+++ ./chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -116,7 +116,7 @@ +@@ -173,7 +173,7 @@ } void RecordLinuxGlibcVersion() { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(__GLIBC__) && !defined(OS_CHROMEOS) - Version version(gnu_get_libc_version()); + base::Version version(gnu_get_libc_version()); UMALinuxGlibcVersion glibc_version_result = UMA_LINUX_GLIBC_NOT_PARSEABLE; -@@ -140,7 +140,7 @@ +@@ -197,7 +197,7 @@ #endif } @@ -177,7 +175,7 @@ UMALinuxWindowManager GetLinuxWindowManager() { switch (ui::GuessWindowManager()) { case ui::WM_UNKNOWN: -@@ -239,7 +239,7 @@ +@@ -330,7 +330,7 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserStart() { RecordLinuxGlibcVersion(); @@ -209,8 +207,8 @@ base::debug::StackTrace trace; diff --git a/third_party/ots/include/opentype-sanitiser.h b/third_party/ots/include/opentype-sanitiser.h index a80ea16..55a2abf 100644 ---- a/third_party/ots/include/opentype-sanitiser.h -+++ b/third_party/ots/include/opentype-sanitiser.h +--- third_party/ots/include/opentype-sanitiser.h ++++ third_party/ots/include/opentype-sanitiser.h @@ -20,6 +20,7 @@ typedef unsigned __int64 uint64_t; #define htonl(x) _byteswap_ulong (x) #define htons(x) _byteswap_ushort (x) |