diff options
Diffstat (limited to 'meta-oe/recipes-devtools/breakpad/breakpad/0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch')
-rw-r--r-- | meta-oe/recipes-devtools/breakpad/breakpad/0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad/0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch b/meta-oe/recipes-devtools/breakpad/breakpad/0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch new file mode 100644 index 000000000..851004704 --- /dev/null +++ b/meta-oe/recipes-devtools/breakpad/breakpad/0003-Fix-conflict-between-musl-libc-dirent.h-and-lss.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 7aa266545dabf9934ccd44d4fc836040497159be Mon Sep 17 00:00:00 2001 | ||
2 | From: Felix Janda <felix.janda@posteo.de> | ||
3 | Date: Sun, 1 Feb 2015 13:41:08 +0100 | ||
4 | Subject: [PATCH 3/3] Fix conflict between musl libc <dirent.h> and lss | ||
5 | |||
6 | Include <dirent.h> late to avoid the macro getdents64 in musl | ||
7 | libc's <dirent.h> to conflict with linux_sycall_support.h. | ||
8 | --- | ||
9 | src/client/linux/crash_generation/crash_generation_server.cc | 3 ++- | ||
10 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/src/client/linux/crash_generation/crash_generation_server.cc b/src/client/linux/crash_generation/crash_generation_server.cc | ||
13 | index 26c50a5c..2596afde 100644 | ||
14 | --- a/src/client/linux/crash_generation/crash_generation_server.cc | ||
15 | +++ b/src/client/linux/crash_generation/crash_generation_server.cc | ||
16 | @@ -28,7 +28,6 @@ | ||
17 | // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
18 | |||
19 | #include <assert.h> | ||
20 | -#include <dirent.h> | ||
21 | #include <fcntl.h> | ||
22 | #include <limits.h> | ||
23 | #include <poll.h> | ||
24 | @@ -49,6 +48,8 @@ | ||
25 | #include "common/linux/guid_creator.h" | ||
26 | #include "common/linux/safe_readlink.h" | ||
27 | |||
28 | +#include <dirent.h> | ||
29 | + | ||
30 | static const char kCommandQuit = 'x'; | ||
31 | |||
32 | namespace google_breakpad { | ||
33 | -- | ||
34 | 2.14.1 | ||
35 | |||