From: Vadim Zeitlin Date: Wed, 17 Dec 2008 15:22:16 +0000 (+0000) Subject: VC6 SDK doesn't define INVALID_FILE_ATTRIBUTES, do it ourselves X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/834c8ade287891232820e8111379cfa1c58f8828 VC6 SDK doesn't define INVALID_FILE_ATTRIBUTES, do it ourselves git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp index 80a5f762a1..24324f04ee 100644 --- a/src/common/filefn.cpp +++ b/src/common/filefn.cpp @@ -96,6 +96,10 @@ #define _MAXPATHLEN 1024 #endif +#ifndef INVALID_FILE_ATTRIBUTES + #define INVALID_FILE_ATTRIBUTES ((DWORD)-1) +#endif + // ---------------------------------------------------------------------------- // private globals // ---------------------------------------------------------------------------- @@ -316,7 +320,7 @@ wxFileExists (const wxString& filename) // it can cope with network (UNC) paths unlike them DWORD ret = ::GetFileAttributes(filename.fn_str()); - return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY); + return (ret != INVALID_FILE_ATTRIBUTES) && !(ret & FILE_ATTRIBUTE_DIRECTORY); #else // !__WIN32__ #ifndef S_ISREG #define S_ISREG(mode) ((mode) & S_IFREG) @@ -1339,7 +1343,7 @@ bool wxDirExists(const wxString& pathName) // stat() can't cope with network paths DWORD ret = ::GetFileAttributes(strPath.fn_str()); - return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY); + return (ret != INVALID_FILE_ATTRIBUTES) && (ret & FILE_ATTRIBUTE_DIRECTORY); #elif defined(__OS2__) FILESTATUS3 Info = {{0}}; APIRET rc = ::DosQueryPathInfo((PSZ)(WXSTRINGCAST strPath), FIL_STANDARD,