From dfefc7b244c493ee7c90329882c7f76156f09fae Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Wed, 17 Jul 2002 06:09:26 +0000 Subject: 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 --- src/Fl_File_Browser.cxx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/Fl_File_Browser.cxx') diff --git a/src/Fl_File_Browser.cxx b/src/Fl_File_Browser.cxx index fb11989bb..711ac5b14 100644 --- a/src/Fl_File_Browser.cxx +++ b/src/Fl_File_Browser.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_File_Browser.cxx,v 1.1.2.18 2002/07/01 21:14:20 easysw Exp $" +// "$Id: Fl_File_Browser.cxx,v 1.1.2.19 2002/07/17 06:09:25 matthiaswm Exp $" // // Fl_File_Browser routines. // @@ -62,7 +62,8 @@ # include #endif // __EMX__ -#ifdef __APPLE__ +// CodeWarrior (__MWERKS__) gets its include paths confused, so we temporarily disable this +#if defined(__APPLE__) && !defined(__MWERKS__) # include # include # include @@ -488,7 +489,7 @@ Fl_File_Browser::load(const char *directory,// I - Directory to load num_files ++; } -#elif defined(__APPLE__) +#elif defined(__APPLE__) && !defined(__MWERKS__) // MacOS X and Darwin use getfsstat() system call... int numfs; // Number of file systems struct statfs *fs; // Buffer for file system info @@ -643,5 +644,5 @@ Fl_File_Browser::filter(const char *pattern) // I - Pattern string // -// End of "$Id: Fl_File_Browser.cxx,v 1.1.2.18 2002/07/01 21:14:20 easysw Exp $". +// End of "$Id: Fl_File_Browser.cxx,v 1.1.2.19 2002/07/17 06:09:25 matthiaswm Exp $". // -- cgit v1.2.3