1 files changed, 16 insertions, 0 deletions
diff --git a/src/mbgl/util/dtoa.cpp b/src/mbgl/util/dtoa.cpp
index dd4fba0f89..0e3aef6117 100644
--- a/src/mbgl/util/dtoa.cpp
+++ b/src/mbgl/util/dtoa.cpp
@@ -1,10 +1,18 @@
 #include "dtoa.hpp"
 
+// Clang/C2 on Windows 64-bits can't parse rapidjson's dtoa
+// and it was causing the compiler to crash.
+#if !defined(_WINDOWS)
 #include <rapidjson/internal/dtoa.h>
+#endif
+
+#include <mbgl/util/string.hpp>
 
 namespace mbgl {
 namespace util {
 
+#if !defined(_WINDOWS)
+
 namespace {
 
 // From https://github.com/miloyip/rapidjson/blob/master/include/rapidjson/internal/dtoa.h
@@ -101,5 +109,13 @@ std::string dtoa(double value) {
     return data;
 }
 
+#else
+
+std::string dtoa(double value) {
+    return std::to_string(value);
+}
+
+#endif
+
 } // namespace util
 } // namespace mbgl