diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-10-29 21:59:15 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-10-29 21:59:15 +0000 |
| commit | a1944b77ab98f7e56cb4c0cddc8bb1681eaacaaa (patch) | |
| tree | 41055a6f53d6a86131feec9f6679f2ed84d2c429 /src/Fl_File_Browser.cxx | |
| parent | 38fdf727f70cf11e595d69f073badcd93aaef14e (diff) | |
Cygwin fixes...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1666 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_File_Browser.cxx')
| -rw-r--r-- | src/Fl_File_Browser.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Fl_File_Browser.cxx b/src/Fl_File_Browser.cxx index 0fc8c54a0..882d10360 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.2 2001/10/29 03:44:32 easysw Exp $" +// "$Id: Fl_File_Browser.cxx,v 1.1.2.3 2001/10/29 21:59:14 easysw Exp $" // // Fl_File_Browser routines. // @@ -45,7 +45,7 @@ #include <string.h> #include <config.h> -#if defined(WIN32) +#if defined(WIN32) && ! defined(__CYGWIN__) # include <windows.h> # include <direct.h> #endif /* WIN32 */ @@ -416,7 +416,7 @@ Fl_File_Browser::load(const char *directory)// I - Directory to load if ((icon = Fl_File_Icon::find("any", Fl_File_Icon::DEVICE)) == NULL) icon = Fl_File_Icon::find("any", Fl_File_Icon::DIRECTORY); -#if defined(WIN32) +#if defined(WIN32) && ! defined (__CYGWIN__) DWORD drives; // Drive available bits @@ -496,7 +496,7 @@ Fl_File_Browser::load(const char *directory)// I - Directory to load // Build the file list... // -#if defined(WIN32) || defined(__EMX__) +#if (defined(WIN32) && ! defined(__CYGWIN__)) || defined(__EMX__) strncpy(filename, directory_, sizeof(filename) - 1); filename[sizeof(filename) - 1] = '\0'; i = strlen(filename) - 1; @@ -566,5 +566,5 @@ Fl_File_Browser::filter(const char *pattern) // I - Pattern string // -// End of "$Id: Fl_File_Browser.cxx,v 1.1.2.2 2001/10/29 03:44:32 easysw Exp $". +// End of "$Id: Fl_File_Browser.cxx,v 1.1.2.3 2001/10/29 21:59:14 easysw Exp $". // |