Fix for bug #1854 qgisinterpolator.cpp causing build error on OS X

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11274 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 5, 2009 · fd86c81 · fd86c81
1 parent c4511e0
commit fd86c81
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/src/core/qgis.h b/src/core/qgis.h
@@ -20,8 +20,8 @@
 #define QGIS_H
 #include <QEvent>
 #include <QString>
-#include <cmath>
 #include <cfloat>
+
 /** \ingroup core
  * The QGis class provides global constants for use throughout the application.
  */

diff --git a/src/plugins/interpolation/MathUtils.h b/src/plugins/interpolation/MathUtils.h
@@ -17,7 +17,11 @@
 #ifndef MATHUTILS_H
 #define MATHUTILS_H
 
+#ifndef Q_OS_MACX
 #include <cmath>
+#else
+#include <math.h>
+#endif
 #include "Vector3D.h"
 #include "Point3D.h"
 

diff --git a/src/plugins/interpolation/Point3D.h b/src/plugins/interpolation/Point3D.h
@@ -17,7 +17,11 @@
 #ifndef POINT3D_H
 #define POINT3D_H
 
+#ifndef Q_OS_MACX
 #include <cmath>
+#else
+#include <math.h>
+#endif
 #include <iostream>
 
 /**Point3D is a class to represent a three dimensional point*/

diff --git a/src/plugins/interpolation/Vector3D.h b/src/plugins/interpolation/Vector3D.h
@@ -17,7 +17,11 @@
 #ifndef VECTOR3D_H
 #define VECTOR3D_H
 
+#ifndef Q_OS_MACX
 #include <cmath>
+#else
+#include <math.h>
+#endif
 
 class Vector3D
       /**