From 629f32738284d715f29f3786b3268a821823945d Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Wed, 17 Jul 2002 15:23:58 +0000
Subject: Use parenthesis for "#if defined foo" -> "#if defined(foo)" -
 portability.

Use ANSI C comments in flstring.h, which is included from both C++ and
C code.

Move prototypes for OSX inside existing "C" wrapper in flstring.h.

Simplify M_PI and M_SQRT2 definitions in FL/math.h; no need to define
them twice...


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2537 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 FL/math.h | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

(limited to 'FL/math.h')

diff --git a/FL/math.h b/FL/math.h
index 6a8eeefa4..1db57ed84 100644
--- a/FL/math.h
+++ b/FL/math.h
@@ -1,5 +1,5 @@
 //
-// "$Id: math.h,v 1.4.2.4.2.4 2002/07/17 06:09:25 matthiaswm Exp $"
+// "$Id: math.h,v 1.4.2.4.2.5 2002/07/17 15:23:58 easysw Exp $"
 //
 // Math header file for the Fast Light Tool Kit (FLTK).
 //
@@ -29,31 +29,20 @@
 #  include <math.h>
 
 
-#  if defined __APPLE__ && defined __MWERKS__
-
+#  ifndef M_PI
 #    define M_PI            3.14159265358979323846
 #    define M_PI_2          1.57079632679489661923
 #    define M_PI_4          0.78539816339744830962
 #    define M_1_PI          0.31830988618379067154
 #    define M_2_PI          0.63661977236758134308
-#    define M_SQRT2         1.41421356237309504880
-#    define M_SQRT1_2       0.70710678118654752440
-
-#  endif
-
+#  endif // !M_PI
 
-#  ifdef WIN32
-// things missing from <math.h>:
-
-#    define M_PI            3.14159265358979323846
-#    define M_PI_2          1.57079632679489661923
-#    define M_PI_4          0.78539816339744830962
-#    define M_1_PI          0.31830988618379067154
-#    define M_2_PI          0.63661977236758134308
+#  ifndef M_SQRT2
 #    define M_SQRT2         1.41421356237309504880
 #    define M_SQRT1_2       0.70710678118654752440
+#  endif // !M_SQRT2
 
-#  elif defined(__EMX__)
+#  ifdef __EMX__
 #    include <float.h>
 #  endif
 
@@ -68,5 +57,5 @@ inline double copysign(double a, double b) {return b<0 ? -a : a;}
 
 
 //
-// End of "$Id: math.h,v 1.4.2.4.2.4 2002/07/17 06:09:25 matthiaswm Exp $".
+// End of "$Id: math.h,v 1.4.2.4.2.5 2002/07/17 15:23:58 easysw Exp $".
 //
-- 
cgit v1.2.3