--- mozilla/toolkit.orig/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc 2014-03-15 05:19:36.000000000 +0000 +++ mozilla/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 --- mozilla/toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.cc 2014-03-15 05:19:36.000000000 +0000 +++ mozilla/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 { --- mozilla/toolkit.orig/crashreporter/google-breakpad/src/common/stabs_reader.h 2014-03-15 05:19:36.000000000 +0000 +++ mozilla/toolkit/crashreporter/google-breakpad/src/common/stabs_reader.h 2014-04-17 10:24:33.793431933 +0000 @@ -53,9 +53,10 @@ #include #endif -#ifdef HAVE_A_OUT_H +#if 0 #include #endif + #ifdef HAVE_MACH_O_NLIST_H #include #endif --- mozilla/toolkit.orig/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2014-03-15 05:19:37.000000000 +0000 +++ mozilla/toolkit/crashreporter/google-breakpad/src/third_party/lss/linux_syscall_support.h 2014-04-17 10:24:33.793431933 +0000 @@ -2813,7 +2813,7 @@ LSS_INLINE _syscall6(void*, mmap, void*, s, size_t, l, int, p, int, f, int, d, - __off64_t, o) + off_t, o) LSS_INLINE _syscall4(int, newfstatat, int, d, const char *, p, --- mozilla/toolkit.orig/mozapps/update/common/updatedefines.h 2014-03-15 05:19:37.000000000 +0000 +++ mozilla/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 --- mozilla/toolkit.orig/mozapps/update/updater/updater.cpp 2014-03-15 05:19:37.000000000 +0000 +++ mozilla/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; }