bug 1118554 - make android's stdcxx work r=glandium
authorBrad Lassey <blassey@mozilla.com>
Tue, 06 Jan 2015 23:34:31 -0500
changeset 248321 93a8e6ea13241cf078bab2b2a255b94364a43215
parent 248320 7a5175e8ba699c91751d9dcff9f4c2dd8bb54d11
child 248322 d74306cdc6f85384888fcc73258f5ec55908a00f
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1118554
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 1118554 - make android's stdcxx work r=glandium
media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp
security/pkix/test/lib/pkixtestutil.cpp
--- a/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp
+++ b/media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp
@@ -16,16 +16,20 @@ Scott McMurray
 
 #ifndef BOOST_SPREAD_SORT_H
 #define BOOST_SPREAD_SORT_H
 #include <algorithm>
 #include <cstring>
 #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
   	template <typename T>
   	inline unsigned 
   	rough_log_2_size(const T& input) 
   	{
   		unsigned result = 0;
--- a/security/pkix/test/lib/pkixtestutil.cpp
+++ b/security/pkix/test/lib/pkixtestutil.cpp
@@ -24,16 +24,17 @@
 
 #include "pkixtestutil.h"
 
 #include <cerrno>
 #include <cstdio>
 #include <limits>
 #include <new>
 #include <sstream>
+#include <stdlib.h>
 
 #include "pkixder.h"
 #include "pkixutil.h"
 
 using namespace std;
 
 namespace mozilla { namespace pkix { namespace test {