diff options
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/filename.H | 14 | ||||
| -rw-r--r-- | FL/math.h | 15 |
2 files changed, 24 insertions, 5 deletions
diff --git a/FL/filename.H b/FL/filename.H index 088d6c8a3..2c8d99376 100644 --- a/FL/filename.H +++ b/FL/filename.H @@ -1,5 +1,5 @@ /* - * "$Id: filename.H,v 1.11.2.4.2.12 2003/01/30 21:40:42 easysw Exp $" + * "$Id: filename.H,v 1.11.2.4.2.13 2003/08/02 05:54:43 matthiaswm Exp $" * * Filename header file for the Fast Light Tool Kit (FLTK). * @@ -55,6 +55,16 @@ inline int fl_filename_relative(char *to, const char *from) { return fl_filename struct dirent {char d_name[1];}; +# elif defined(__APPLE__) && defined(__PROJECTBUILDER__) + +// Apple's ProjectBuilder has the nasty habit of including recursively +// down the file tree. To avoid re-including <FL/dirent.h> we must +// directly include the systems math file. (Plus, I could not find a +// predefined macro for ProjectBuilder builds, so we have to define it +// in the project) +# include <sys/types.h> +# include "/usr/include/dirent.h" + # else /* * WARNING: on some systems (very few nowadays?) <dirent.h> may not exist. @@ -117,5 +127,5 @@ FL_EXPORT int fl_filename_list(const char *d, struct dirent ***l, #endif /* FL_FILENAME_H */ /* - * End of "$Id: filename.H,v 1.11.2.4.2.12 2003/01/30 21:40:42 easysw Exp $". + * End of "$Id: filename.H,v 1.11.2.4.2.13 2003/08/02 05:54:43 matthiaswm Exp $". */ @@ -1,5 +1,5 @@ // -// "$Id: math.h,v 1.4.2.4.2.8 2003/01/30 21:40:55 easysw Exp $" +// "$Id: math.h,v 1.4.2.4.2.9 2003/08/02 05:54:43 matthiaswm Exp $" // // Math header file for the Fast Light Tool Kit (FLTK). // @@ -26,7 +26,16 @@ #ifndef fl_math_h # define fl_math_h -# include <math.h> +// Apple's ProjectBuilder has the nasty habit of including recursively +// down the file tree. To avoid re-including <FL/math.h> we must +// directly include the systems math file. (Plus, I could not find a +// predefined macro for ProjectBuilder builds, so we have to define it +// in the project) +# if defined(__APPLE__) && defined(__PROJECTBUILDER__) +# include "/usr/include/math.h" +# else +# include <math.h> +# endif # ifndef M_PI @@ -57,5 +66,5 @@ inline double copysign(double a, double b) {return b<0 ? -a : a;} // -// End of "$Id: math.h,v 1.4.2.4.2.8 2003/01/30 21:40:55 easysw Exp $". +// End of "$Id: math.h,v 1.4.2.4.2.9 2003/08/02 05:54:43 matthiaswm Exp $". // |