From 2ed75873799366844f21f27adf6c1b5daec3b2e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josip=20Jan=C5=BEi=C4=87?= <josip.janzic@gmail.com> Date: Thu, 12 Feb 2015 14:30:07 +0100 Subject: [PATCH 1/2] define correct isnan, isinf functions --- src/CanvasRenderingContext2d.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/CanvasRenderingContext2d.cc b/src/CanvasRenderingContext2d.cc index 74b5924..50c8abd 100755 --- 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; /* From 23e654a4c0e697890d2121debfd576d9b597a8e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josip=20Jan=C5=BEi=C4=87?= <josip.janzic@gmail.com> Date: Sat, 14 Feb 2015 00:34:57 +0100 Subject: [PATCH 2/2] run travis tests against io.js --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7049d0c..a94053f 100644 --- 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