Include <string> and <istream> outside __pnacl__.

third_party/jsoncpp/overrides/src/lib_json/json_reader.cpp

Index: third_party/jsoncpp/overrides/src/lib_json/json_reader.cpp
diff --git a/third_party/jsoncpp/overrides/src/lib_json/json_reader.cpp b/third_party/jsoncpp/overrides/src/lib_json/json_reader.cpp
index 1bc7429993b7543dd94e6a169c439e27409c98e6..f8cfad70510c2e810746dc236eb4435279767dd3 100644
--- a/third_party/jsoncpp/overrides/src/lib_json/json_reader.cpp
+++ b/third_party/jsoncpp/overrides/src/lib_json/json_reader.cpp
@@ -14,16 +14,8 @@
 #include <cassert>
 #include <cstring>
 #include <stdexcept>
-#ifdef __pnacl__
-// This file uses the following headers (at least in Reader::parse), but
-// the upstream version doesn't include them because iostream pulls in
-// static initializers.  This breaks the PNaCl build because it uses
-// libc++ which declares getline in <string> (as per the C++ standard)
-// but defines it in <iostream>. The code therefore fails linking, which
-// these includes fix.
 #include <string>
-#include <iostream>
-#endif
+#include <istream>
 
 #if _MSC_VER >= 1400 // VC++ 8.0
 #pragma warning( disable : 4996 )   // disable warning about strdup being deprecated.