From 33ab8e9b66b7bef9221b4849000e74d0b164df28 Mon Sep 17 00:00:00 2001
From: Brad Lassey <blassey@mozilla.com>
Date: Tue, 6 Jan 2015 23:34:31 -0500
Subject: [PATCH] bug 1118554 - make android's stdcxx work r=glandium

---
 .../system_wrappers/source/spreadsortlib/spreadsort.hpp       | 4 ++++
 security/pkix/test/lib/pkixtestutil.cpp                       | 1 +
 2 files changed, 5 insertions(+)

diff --git a/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp b/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp
index b934e3ebfbe5..31080ada2d6f 100644
--- a/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp
+++ b/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp
@@ -21,6 +21,10 @@ Scott McMurray
 #include <vector>
 #include "webrtc/system_wrappers/source/spreadsortlib/constants.hpp"
 
+#ifdef getchar
+#undef getchar
+#endif
+
 namespace boost {
   namespace detail {
   	//This only works on unsigned data types
diff --git a/security/pkix/test/lib/pkixtestutil.cpp b/security/pkix/test/lib/pkixtestutil.cpp
index 9c98804f1eef..0994ebfea6ed 100644
--- a/security/pkix/test/lib/pkixtestutil.cpp
+++ b/security/pkix/test/lib/pkixtestutil.cpp
@@ -29,6 +29,7 @@
 #include <limits>
 #include <new>
 #include <sstream>
+#include <stdlib.h>
 
 #include "pkixder.h"
 #include "pkixutil.h"