Patch from Firefox ESR 38 Void packaging. --- 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; } --- mozilla/toolkit.orig/xre/nsSigHandlers.cpp 2014-03-15 05:19:38.000000000 +0000 +++ mozilla/toolkit/xre/nsSigHandlers.cpp 2014-04-17 10:24:33.796765327 +0000 @@ -15,6 +15,7 @@ #include #include #include +#include #include "prthread.h" #include "plstr.h" #include "prenv.h" @@ -152,7 +153,7 @@ status->__invalid = status->__denorm = status->__zdiv = status->__ovrfl = status->__undfl = status->__precis = status->__stkflt = status->__errsumm = 0; - __uint32_t *mxcsr = &uc->uc_mcontext->__fs.__fpu_mxcsr; + u_int32_t *mxcsr = &uc->uc_mcontext->__fs.__fpu_mxcsr; *mxcsr |= SSE_EXCEPTION_MASK; /* disable all SSE exceptions */ *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */ #endif @@ -172,13 +173,13 @@ *sw &= ~FPU_STATUS_FLAGS; #endif #if defined(__amd64__) - __uint16_t *cw = &uc->uc_mcontext.fpregs->cwd; + u_int16_t *cw = &uc->uc_mcontext.fpregs->cwd; *cw |= FPU_EXCEPTION_MASK; - __uint16_t *sw = &uc->uc_mcontext.fpregs->swd; + u_int16_t *sw = &uc->uc_mcontext.fpregs->swd; *sw &= ~FPU_STATUS_FLAGS; - __uint32_t *mxcsr = &uc->uc_mcontext.fpregs->mxcsr; + u_int32_t *mxcsr = &uc->uc_mcontext.fpregs->mxcsr; *mxcsr |= SSE_EXCEPTION_MASK; /* disable all SSE exceptions */ *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */ #endif @@ -187,24 +188,24 @@ ucontext_t *uc = (ucontext_t *)context; #if defined(__i386) - uint32_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[0]; + u_int32_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[0]; *cw |= FPU_EXCEPTION_MASK; - uint32_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[1]; + u_int32_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[1]; *sw &= ~FPU_STATUS_FLAGS; /* address of the instruction that caused the exception */ - uint32_t *ip = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[3]; + u_int32_t *ip = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.state[3]; uc->uc_mcontext.gregs[REG_PC] = *ip; #endif #if defined(__amd64__) - uint16_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.cw; + u_int16_t *cw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.cw; *cw |= FPU_EXCEPTION_MASK; - uint16_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.sw; + u_int16_t *sw = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.sw; *sw &= ~FPU_STATUS_FLAGS; - uint32_t *mxcsr = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.mxcsr; + u_int32_t *mxcsr = &uc->uc_mcontext.fpregs.fp_reg_set.fpchip_state.mxcsr; *mxcsr |= SSE_EXCEPTION_MASK; /* disable all SSE exceptions */ *mxcsr &= ~SSE_STATUS_FLAGS; /* clear all pending SSE exceptions */ #endif