From cdc15f49a6d491b6a117a98f96e282113ee9cc97 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Thu, 27 Jun 2002 20:52:44 +0000 Subject: Fix math header for nocygwin mode. Revert focus check in fl_fix_focus(). Don't click the click count in Fl_Browser_::select(). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2324 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/math.h | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) (limited to 'FL/math.h') diff --git a/FL/math.h b/FL/math.h index 069ba5ba4..3d830988d 100644 --- a/FL/math.h +++ b/FL/math.h @@ -1,5 +1,5 @@ // -// "$Id: math.h,v 1.4.2.4.2.1 2002/01/01 15:11:28 easysw Exp $" +// "$Id: math.h,v 1.4.2.4.2.2 2002/06/27 20:52:44 easysw Exp $" // // Math header file for the Fast Light Tool Kit (FLTK). // @@ -24,38 +24,35 @@ // #ifndef fl_math_h -#define fl_math_h +# define fl_math_h -#include +# include -#ifdef WIN32 +# ifdef WIN32 // things missing from : -#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 +# 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 -#else +# elif defined(__EMX__) +# include +# endif -#ifdef __EMX__ -#include -#endif - -#endif - -#if defined(WIN32) || defined(CRAY) +# if (defined(WIN32) || defined(CRAY)) && !__MINGW32__ inline double rint(double v) {return floor(v+.5);} inline double copysign(double a, double b) {return b<0 ? -a : a;} -#endif +# endif // (WIN32 || CRAY) && !__MINGW32__ + +#endif // !fl_math_h -#endif // -// End of "$Id: math.h,v 1.4.2.4.2.1 2002/01/01 15:11:28 easysw Exp $". +// End of "$Id: math.h,v 1.4.2.4.2.2 2002/06/27 20:52:44 easysw Exp $". // -- cgit v1.2.3