Merge pull request #522 from janza/iojs-build-fix

Define correct isnan, isinf functions
Automattic · Feb 20, 2015 · eb8f50b · eb8f50b
2 parents e015514 + 23e654a
commit eb8f50b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ node_js:
   - '0.8'
   - '0.10'
   - '0.11'
+  - 'iojs'
 before_install:
   - sudo chown -R $USER /usr/local
   - sh install
diff --git a/src/CanvasRenderingContext2d.cc b/src/CanvasRenderingContext2d.cc
@@ -23,11 +23,16 @@
 #endif
 
 // Windows doesn't support the C99 names for these
-#ifndef isnan
+#ifdef _MSC_VER
 #define isnan(x) _isnan(x)
 #define isinf(x) (!_finite(x))
 #endif
 
+#ifndef isnan
+#define isnan(x) std::isnan(x)
+#define isinf(x) std::isinf(x)
+#endif
+
 Persistent<FunctionTemplate> Context2d::constructor;
 
 /*