Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VC6 SDK doesn't define INVALID_FILE_ATTRIBUTES, do it ourselves

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-12-17 15:22:16 +00:00
parent 888e963843
commit 834c8ade28
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/filefn.cpp
View File

@@ -96,6 +96,10 @@
#define _MAXPATHLEN 1024 #define _MAXPATHLEN 1024
#endif #endif
#ifndef INVALID_FILE_ATTRIBUTES
#define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// private globals // private globals
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -316,7 +320,7 @@ wxFileExists (const wxString& filename)
// it can cope with network (UNC) paths unlike them // it can cope with network (UNC) paths unlike them
DWORD ret = ::GetFileAttributes(filename.fn_str()); 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__ #else // !__WIN32__
#ifndef S_ISREG #ifndef S_ISREG
#define S_ISREG(mode) ((mode) & S_IFREG) #define S_ISREG(mode) ((mode) & S_IFREG)
@@ -1339,7 +1343,7 @@ bool wxDirExists(const wxString& pathName)
// stat() can't cope with network paths // stat() can't cope with network paths
DWORD ret = ::GetFileAttributes(strPath.fn_str()); 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__) #elif defined(__OS2__)
FILESTATUS3 Info = {{0}}; FILESTATUS3 Info = {{0}};
APIRET rc = ::DosQueryPathInfo((PSZ)(WXSTRINGCAST strPath), FIL_STANDARD, APIRET rc = ::DosQueryPathInfo((PSZ)(WXSTRINGCAST strPath), FIL_STANDARD,