--- toolkit.orig/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h.orig 2016-07-05 21:00:03.672000517 +0200 +++ toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2016-07-05 21:05:37.347806230 +0200 @@ -1134,6 +1134,12 @@ #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 --- toolkit.orig/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2014-03-15 05:19:36.000000000 +0000 +++ toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2014-04-17 10:24:33.793431933 +0000 @@ -45,6 +45,7 @@ #include #include #include +#include #include #include --- toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.cc 2014-03-15 05:19:36.000000000 +0000 +++ toolkit/crashreporter/google-breakpad/src/common/stabs_reader.cc 2014-04-17 10:24:33.793431933 +0000 @@ -41,6 +41,10 @@ #include "common/using_std_string.h" +#ifndef N_UNDF +#define N_UNDF 0 +#endif + using std::vector; namespace google_breakpad { --- toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.h 2014-03-15 05:19:36.000000000 +0000 +++ toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h 2014-04-17 10:24:33.793431933 +0000 @@ -55,7 +55,7 @@ #ifdef HAVE_MACH_O_NLIST_H #include -#elif defined(HAVE_A_OUT_H) +#elif 0 #include #endif --- toolkit.orig/mozapps/update/common/updatedefines.h 2014-03-15 05:19:37.000000000 +0000 +++ toolkit/mozapps/update/common/updatedefines.h 2014-04-17 10:24:33.793431933 +0000 @@ -105,7 +105,7 @@ #ifdef SOLARIS # include -#else +#elif !defined(__linux__) || defined(__GLIBC__) # include #endif # include --- toolkit.orig/mozapps/update/updater/updater.cpp 2014-03-15 05:19:37.000000000 +0000 +++ toolkit/mozapps/update/updater/updater.cpp 2014-04-17 10:24:33.796765327 +0000 @@ -3432,6 +3432,7 @@ int add_dir_entries(const NS_tchar *dirpath, ActionList *list) { int rv = OK; +#if !defined(__linux__) || defined(__GLIBC__) FTS *ftsdir; FTSENT *ftsdirEntry; NS_tchar searchpath[MAXPATHLEN]; @@ -3534,6 +3535,7 @@ } fts_close(ftsdir); +#endif return rv; }