From a55d2b1eff0264e650df0e95fc40eea7e87d1208 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Mon, 26 Sep 2005 12:05:43 +0000
Subject: [PATCH] * flower/include/real.hh: include <math.h> iso. <cmath>

* flower/include/offset.hh: include real.hh
---
 ChangeLog                   | 6 ++++++
 flower/include/interval.hh  | 2 ++
 flower/include/interval.tcc | 4 +++-
 flower/include/offset.hh    | 1 +
 flower/include/real.hh      | 7 ++++++-
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c92892f0f4..94c266c6f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-26  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* flower/include/real.hh: include <math.h> iso. <cmath>
+
+	* flower/include/offset.hh: include real.hh
+
 2005-09-20  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* Documentation/user/changing-defaults.itely (Difficult tweaks):
diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index 08a48a9898..5b6e59d06d 100644
--- a/flower/include/interval.hh
+++ b/flower/include/interval.hh
@@ -7,6 +7,8 @@
 #ifndef INTERVAL_HH
 #define INTERVAL_HH
 
+#include <math.h>
+
 #include "flower-proto.hh"
 #include "drul-array.hh"
 
diff --git a/flower/include/interval.tcc b/flower/include/interval.tcc
index 0ac8de264f..94186ada15 100644
--- a/flower/include/interval.tcc
+++ b/flower/include/interval.tcc
@@ -10,7 +10,9 @@
 #define INTERVAL_TCC
 
 #include <cassert>
-#include <cmath>
+
+// MacOS 10.3 problems:
+// #include <cmath>
 using namespace std;
 
 #include "interval.hh"
diff --git a/flower/include/offset.hh b/flower/include/offset.hh
index 7929573ee7..eaefeb26bb 100644
--- a/flower/include/offset.hh
+++ b/flower/include/offset.hh
@@ -9,6 +9,7 @@
 
 #include "axis.hh"
 #include "string.hh"
+#include "real.hh"
 
 Offset complex_multiply (Offset, Offset);
 Offset complex_divide (Offset, Offset);
diff --git a/flower/include/real.hh b/flower/include/real.hh
index 598c35199a..657c0cb677 100644
--- a/flower/include/real.hh
+++ b/flower/include/real.hh
@@ -11,7 +11,12 @@
 
 #include <algorithm>
 #include <climits>
-#include <cmath>
+
+/*
+  MacOS 10.3 uses g++ 3.3 which doesn't have std::isinf()
+ */
+// #include <cmath>
+#include <math.h>
 using namespace std;
 
 
-- 
2.39.5