diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2002-07-17 06:09:26 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2002-07-17 06:09:26 +0000 |
| commit | dfefc7b244c493ee7c90329882c7f76156f09fae (patch) | |
| tree | 0248c420aadb9e028676a8fb28809308fdb120ee /FL | |
| parent | c48c20c49c12e7659cf425823d4ebc349ad37dca (diff) | |
First steps in CodeWarrior on OS_X support.
(Praise the day when I finally stop screwing up cvs ;-/ )
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2536 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl.H | 8 | ||||
| -rw-r--r-- | FL/Fl_Menu_Item.H | 8 | ||||
| -rw-r--r-- | FL/math.h | 18 |
3 files changed, 28 insertions, 6 deletions
@@ -1,5 +1,5 @@ // -// "$Id: Fl.H,v 1.8.2.11.2.17 2002/07/14 19:08:25 easysw Exp $" +// "$Id: Fl.H,v 1.8.2.11.2.18 2002/07/17 06:09:25 matthiaswm Exp $" // // Main header file for the Fast Light Tool Kit (FLTK). // @@ -31,6 +31,10 @@ # define Fl_Object Fl_Widget # endif +# ifdef check +# undef check +# endif + class Fl_Widget; class Fl_Window; class Fl_Image; @@ -253,5 +257,5 @@ public: #endif // !Fl_H // -// End of "$Id: Fl.H,v 1.8.2.11.2.17 2002/07/14 19:08:25 easysw Exp $". +// End of "$Id: Fl.H,v 1.8.2.11.2.18 2002/07/17 06:09:25 matthiaswm Exp $". // diff --git a/FL/Fl_Menu_Item.H b/FL/Fl_Menu_Item.H index 410a03726..28106282b 100644 --- a/FL/Fl_Menu_Item.H +++ b/FL/Fl_Menu_Item.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_Item.H,v 1.5.2.4.2.2 2002/01/01 15:11:28 easysw Exp $" +// "$Id: Fl_Menu_Item.H,v 1.5.2.4.2.3 2002/07/17 06:09:25 matthiaswm Exp $" // // Menu item header file for the Fast Light Tool Kit (FLTK). // @@ -31,6 +31,10 @@ #include "Fl_Widget.H" #endif +#if defined __APPLE__ && defined __MWERKS__ +# undef check +#endif + enum { // values for flags: FL_MENU_INACTIVE = 1, FL_MENU_TOGGLE= 2, @@ -153,5 +157,5 @@ enum { // back-compatability enum: #endif // -// End of "$Id: Fl_Menu_Item.H,v 1.5.2.4.2.2 2002/01/01 15:11:28 easysw Exp $". +// End of "$Id: Fl_Menu_Item.H,v 1.5.2.4.2.3 2002/07/17 06:09:25 matthiaswm Exp $". // @@ -1,5 +1,5 @@ // -// "$Id: math.h,v 1.4.2.4.2.3 2002/06/29 00:10:04 matthiaswm Exp $" +// "$Id: math.h,v 1.4.2.4.2.4 2002/07/17 06:09:25 matthiaswm Exp $" // // Math header file for the Fast Light Tool Kit (FLTK). // @@ -28,6 +28,20 @@ # include <math.h> + +# if defined __APPLE__ && defined __MWERKS__ + +# 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 + + # ifdef WIN32 // things missing from <math.h>: @@ -54,5 +68,5 @@ inline double copysign(double a, double b) {return b<0 ? -a : a;} // -// End of "$Id: math.h,v 1.4.2.4.2.3 2002/06/29 00:10:04 matthiaswm Exp $". +// End of "$Id: math.h,v 1.4.2.4.2.4 2002/07/17 06:09:25 matthiaswm Exp $". // |