Partially fix 1678141: value.h wasn't including OpenEXR/half.h although it uses symbo...

[synfig.git] / synfig-core / trunk / src / synfig / vector.h

diff --git a/synfig-core/trunk/src/synfig/vector.h b/synfig-core/trunk/src/synfig/vector.h
index 2d71e78..80ff976 100644 (file)
--- a/synfig-core/trunk/src/synfig/vector.h
+++ b/synfig-core/trunk/src/synfig/vector.h
@@ -28,11 +28,10 @@
 /* === H E A D E R S ======================================================= */
 
 #include "real.h"
-#include <cmath>
+#include <math.h>
 
 /* === M A C R O S ========================================================= */
 
-#ifndef isnan
 
 #ifdef WIN32
 #include <float.h>
@@ -42,12 +41,18 @@ extern "C" { int _isnan(double x); }
 #endif
 #endif
 
-#ifdef __APPLE__
-#define isnan __isnanf
+// For some reason isnan() isn't working on macosx any more.
+// This is a quick fix.
+#if defined(__APPLE__) && !defined(SYNFIG_ISNAN_FIX)
+#ifdef isnan
+#undef isnan
 #endif
-
+inline bool isnan(double x) { return x != x; }
+inline bool isnan(float x) { return x != x; }
+#define SYNFIG_ISNAN_FIX 1
 #endif
 
+
 /* === T Y P E D E F S ===================================================== */
 
 /* === C L A S S E S & S T R U C T S ======================================= */