Bug 617115 - crashreporter fixes part. r=ted

rnewman · May 27, 2011 · 1089f5e · 1089f5e
1 parent 7f89daa
commit 1089f5e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/toolkit/crashreporter/Makefile.in b/toolkit/crashreporter/Makefile.in
@@ -100,6 +100,8 @@ endif
 
 ifeq ($(OS_TARGET),Android)
 DIRS += fileid
+# NDK5 workarounds
+DEFINES += -D_STLP_CONST_CONSTRUCTOR_BUG -D_STLP_NO_MEMBER_TEMPLATES
 endif
 
 DIRS += client

diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in
@@ -68,4 +68,9 @@ CPPSRCS	= \
 FORCE_STATIC_LIB = 1
 FORCE_USE_PIC = 1
 
+ifeq ($(OS_TARGET),Android)
+# NDK5 workarounds
+DEFINES += -D_STLP_CONST_CONSTRUCTOR_BUG -D_STLP_NO_MEMBER_TEMPLATES
+endif
+
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc
@@ -99,6 +99,8 @@
 #include "common/linux/guid_creator.h"
 #include "common/linux/eintr_wrapper.h"
 
+#include "linux/sched.h"
+
 #ifndef PR_SET_PTRACER
 #define PR_SET_PTRACER 0x59616d61
 #endif

diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc
@@ -57,6 +57,7 @@
 #endif
 #include <stdio.h>
 #include <unistd.h>
+#include <ctype.h>
 #if !defined(__ANDROID__)
 #include <sys/ucontext.h>
 #include <sys/user.h>