diff options
| -rw-r--r-- | tools/source/fsys/wntmsc.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx index 30520c2b4732..0d2a8a39ad52 100644 --- a/tools/source/fsys/wntmsc.cxx +++ b/tools/source/fsys/wntmsc.cxx @@ -572,7 +572,9 @@ FileStat::FileStat( const void *pInfo, // struct dirent #pragma warning(push, 1) #pragma warning(disable: 4917) #endif +#define ULONG WIN_ULONG #include <shlobj.h> +#undef ULONG #ifdef _MSC_VER #pragma warning(pop) #endif @@ -611,8 +613,8 @@ HRESULT SHGetIDListFromPath( HWND hwndOwner, LPCTSTR pszPath, LPITEMIDLIST *ppid if ( FAILED(hResult) ) return hResult; - ULONG chEaten = lstrlen( pszPath ); - DWORD dwAttributes = FILE_ATTRIBUTE_DIRECTORY; + WIN_ULONG chEaten = lstrlen( pszPath ); + DWORD dwAttributes = FILE_ATTRIBUTE_DIRECTORY; #ifdef UNICODE LPOLESTR wszPath = pszPath; |