forked from kiss-community/repo
91 lines
3.2 KiB
Diff
91 lines
3.2 KiB
Diff
|
diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
|
||
|
|
index 4222ce3..4d40c6a 100644
|
||
|
|
--- a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
|
||
|
|
+++ b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc
|
||
|
|
@@ -46,6 +46,7 @@
|
||
|
|
#include <sys/mman.h>
|
||
|
|
#include <sys/stat.h>
|
||
|
|
#include <unistd.h>
|
||
|
|
+#include <libgen.h>
|
||
|
|
|
||
|
|
#include <iostream>
|
||
|
|
#include <set>
|
||
|
|
diff --git a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc
|
||
|
|
index 6019fc7..5953e32 100644
|
||
|
|
--- a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc
|
||
|
|
+++ b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc
|
||
|
|
@@ -41,6 +41,10 @@
|
||
|
|
|
||
|
|
#include "common/using_std_string.h"
|
||
|
|
|
||
|
|
+#ifndef N_UNDF
|
||
|
|
+#define N_UNDF 0
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
using std::vector;
|
||
|
|
|
||
|
|
namespace google_breakpad {
|
||
|
|
diff --git a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h
|
||
|
|
index 98ee2dd..d57aa68 100644
|
||
|
|
--- a/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h
|
||
|
|
+++ b/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h
|
||
|
|
@@ -55,7 +55,7 @@
|
||
|
|
|
||
|
|
#ifdef HAVE_MACH_O_NLIST_H
|
||
|
|
#include <mach-o/nlist.h>
|
||
|
|
-#elif defined(HAVE_A_OUT_H)
|
||
|
|
+#elif 0
|
||
|
|
#include <a.out.h>
|
||
|
|
#endif
|
||
|
|
|
||
|
|
diff --git a/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h b/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
|
||
|
|
index 93fdad7..f34e5e0 100644
|
||
|
|
--- a/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
|
||
|
|
+++ b/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h
|
||
|
|
@@ -1239,6 +1239,12 @@ struct kernel_statfs {
|
||
|
|
#ifndef __NR_fallocate
|
||
|
|
#define __NR_fallocate 285
|
||
|
|
#endif
|
||
|
|
+
|
||
|
|
+#undef __NR_pread
|
||
|
|
+#define __NR_pread __NR_pread64
|
||
|
|
+#undef __NR_pwrite
|
||
|
|
+#define __NR_pwrite __NR_pwrite64
|
||
|
|
+
|
||
|
|
/* End of x86-64 definitions */
|
||
|
|
#elif defined(__mips__)
|
||
|
|
#if _MIPS_SIM == _MIPS_SIM_ABI32
|
||
|
|
diff --git a/toolkit/mozapps/update/common/updatedefines.h b/toolkit/mozapps/update/common/updatedefines.h
|
||
|
|
index 79276f7..4c67976 100644
|
||
|
|
--- a/toolkit/mozapps/update/common/updatedefines.h
|
||
|
|
+++ b/toolkit/mozapps/update/common/updatedefines.h
|
||
|
|
@@ -87,7 +87,7 @@ static inline int mywcsprintf(WCHAR* dest, size_t count, const WCHAR* fmt,
|
||
|
|
|
||
|
|
# ifdef SOLARIS
|
||
|
|
# include <sys/stat.h>
|
||
|
|
-# else
|
||
|
|
+# elif !defined(__linux__) || defined(__GLIBC__)
|
||
|
|
# include <fts.h>
|
||
|
|
# endif
|
||
|
|
# include <dirent.h>
|
||
|
|
diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp
|
||
|
|
index 257ccb4..01314e4 100644
|
||
|
|
--- a/toolkit/mozapps/update/updater/updater.cpp
|
||
|
|
+++ b/toolkit/mozapps/update/updater/updater.cpp
|
||
|
|
@@ -3978,6 +3978,7 @@
|
||
|
|
|
||
|
|
int add_dir_entries(const NS_tchar* dirpath, ActionList* list) {
|
||
|
|
int rv = OK;
|
||
|
|
+#if !defined(__linux__) || defined(__GLIBC__)
|
||
|
|
FTS* ftsdir;
|
||
|
|
FTSENT* ftsdirEntry;
|
||
|
|
mozilla::UniquePtr<NS_tchar[]> searchpath(get_full_path(dirpath));
|
||
|
|
@@ -4085,6 +4086,7 @@
|
||
|
|
}
|
||
|
|
|
||
|
|
fts_close(ftsdir);
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
return rv;
|
||
|
|
}
|