bug 1118554 - make android's stdcxx work r=glandium

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

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"