21 lines
941 B
Diff
21 lines
941 B
Diff
|
--- qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp 2016-03-03 15:48:36.000000000 +0100
|
||
|
|
+++ qtwebengine/src/3rdparty/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp 2016-03-17 06:31:13.832778611 +0100
|
||
|
|
@@ -67,7 +67,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.
|
||
|
|
@@ -114,7 +114,7 @@
|
||
|
|
|
||
|
|
void* StackFrameDepth::getStackStart()
|
||
|
|
{
|
||
|
|
-#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD)
|
||
|
|
+#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
|
||
|
|
pthread_attr_t attr;
|
||
|
|
int error;
|
||
|
|
#if OS(FREEBSD)
|