845f11032a
[ci skip] Closes: #2538 [via git-merge-pr] Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From 1ac282ad3a859077cbff8bf4773db9bb5b6a5bbd Mon Sep 17 00:00:00 2001
|
|
From: Felix Janda <felix.janda@posteo.de>
|
|
Date: Sun, 1 Feb 2015 13:41:08 +0100
|
|
Subject: [PATCH 1/6] Fix conflict between musl libc <dirent.h> and lss
|
|
|
|
Include <dirent.h> late to avoid the macro getdents64 in musl
|
|
libc's <dirent.h> to conflict with linux_sycall_support.h.
|
|
---
|
|
qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/crash_generation/crash_generation_server.cc | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/client/linux/crash_generation/crash_generation_server.cc b/src/client/linux/crash_generation/crash_generation_server.cc
|
|
index 860e8bc..f0aa801 100644
|
|
--- qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/crash_generation/crash_generation_server.cc
|
|
+++ qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/crash_generation/crash_generation_server.cc
|
|
@@ -28,7 +28,6 @@
|
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
#include <assert.h>
|
|
-#include <dirent.h>
|
|
#include <fcntl.h>
|
|
#include <limits.h>
|
|
#include <poll.h>
|
|
@@ -49,6 +48,8 @@
|
|
#include "common/linux/guid_creator.h"
|
|
#include "common/linux/safe_readlink.h"
|
|
|
|
+#include <dirent.h>
|
|
+
|
|
static const char kCommandQuit = 'x';
|
|
|
|
namespace google_breakpad {
|
|
--
|
|
2.0.5
|
|
|