diff --git a/README.md b/README.md
index bf3aa58..815d036 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,13 @@
 
 ## Features
 
-* Portable C++. C++-03 with STL dependency only.
+* Written in portable C++. C++-03 with STL dependency only.
+  * [x] macOS + clang(LLVM)
+  * [x] iOS + clang
+  * [x] Linux + gcc/clang
+  * [x] Windows + MinGW
+  * [x] Android + CrystaX(NDK drop-in replacement) GCC
+  * [x] Web using Emscripten(LLVM)
 * Moderate parsing time and memory consumption.
 * glTF specification v2.0.0
   * [x] ASCII glTF
diff --git a/picojson.h b/picojson.h
index f75c399..939c5d3 100644
--- a/picojson.h
+++ b/picojson.h
@@ -231,10 +231,13 @@
   if (
 #ifdef _MSC_VER
       !_finite(n)
-#elif __cplusplus >= 201103L || !(defined(isnan) && defined(isinf))
+#elif __cplusplus >= 201103L
       std::isnan(n) || std::isinf(n)
-#else
+#elif defined(isnan) && defined(isinf)
       isnan(n) || isinf(n)
+#else
+      // ???. No nan&inf check
+      0
 #endif
           ) {
     throw std::overflow_error("");