From 3ddd1795adb6e53fe506cc272e2f38f0b9e8261e Mon Sep 17 00:00:00 2001
From: mhugent <mhugent@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Wed, 5 Aug 2009 13:25:06 +0000
Subject: [PATCH] Fix for bug #1854 qgisinterpolator.cpp causing build error on
 OS X

git-svn-id: http://svn.osgeo.org/qgis/trunk@11274 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 src/core/qgis.h                       | 2 +-
 src/plugins/interpolation/MathUtils.h | 4 ++++
 src/plugins/interpolation/Point3D.h   | 4 ++++
 src/plugins/interpolation/Vector3D.h  | 4 ++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/core/qgis.h b/src/core/qgis.h
index ce5f42002cb..88220da998f 100644
--- 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
index 6a35207de42..a54e10362f7 100644
--- 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
index 3f7548d0c40..d459ee903b4 100644
--- 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
index 486e4a53d82..203c35a7dbf 100644
--- 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
       /**