From dc846eaa291bb0247b92b6272ca476bea2ee2449 Mon Sep 17 00:00:00 2001 From: Bill Spitzak Date: Thu, 8 Jun 2000 08:12:38 +0000 Subject: [PATCH] Put the Win32 fix inside #ifdef WIN32 git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1182 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/filename_isdir.cxx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/filename_isdir.cxx b/src/filename_isdir.cxx index 302b17678..3c3b80bcd 100644 --- a/src/filename_isdir.cxx +++ b/src/filename_isdir.cxx @@ -1,5 +1,5 @@ // -// "$Id: filename_isdir.cxx,v 1.4.2.3 2000/06/06 15:25:20 mike Exp $" +// "$Id: filename_isdir.cxx,v 1.4.2.4 2000/06/08 08:12:38 bill Exp $" // // Directory detection routines for the Fast Light Tool Kit (FLTK). // @@ -31,10 +31,10 @@ #include int filename_isdir(const char* n) { + struct stat s; +#ifdef WIN32 char fn[1024]; int length; - struct stat s; - // This workaround brought to you by the fine folks at Microsoft! // (read lots of sarcasm in that...) strncpy(fn, n, sizeof(fn) - 1); @@ -42,10 +42,11 @@ int filename_isdir(const char* n) { length = strlen(fn); if (length > 0 && (fn[length - 1] == '/' || fn[length - 1] == '\\')) fn[length - 1] = '\0'; // Strip trailing slash... - - return !stat(fn, &s) && (s.st_mode&0170000)==0040000; + n = fn; +#endif + return !stat(n, &s) && (s.st_mode&0170000)==0040000; } // -// End of "$Id: filename_isdir.cxx,v 1.4.2.3 2000/06/06 15:25:20 mike Exp $". +// End of "$Id: filename_isdir.cxx,v 1.4.2.4 2000/06/08 08:12:38 bill Exp $". //