Skip to content

C
core
Kaydet (Commit) 8b6ca219 authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

Define ULONG as WIN_ULONG while including shlobj.h 

To match what prewin.h/postwin.h do.
üst 8ff27501
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
tools/source/fsys/wntmsc.cxx
Dosyayı görüntüle @ 8b6ca219
...@@ -572,7 +572,9 @@ FileStat::FileStat( const void *pInfo, // struct dirent ...@@ -572,7 +572,9 @@ FileStat::FileStat( const void *pInfo, // struct dirent
#pragma warning(push, 1) #pragma warning(push, 1)
#pragma warning(disable: 4917) #pragma warning(disable: 4917)
#endif #endif
#define ULONG WIN_ULONG
#include <shlobj.h> #include <shlobj.h>
#undef ULONG
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#endif #endif
...@@ -611,8 +613,8 @@ HRESULT SHGetIDListFromPath( HWND hwndOwner, LPCTSTR pszPath, LPITEMIDLIST *ppid ...@@ -611,8 +613,8 @@ HRESULT SHGetIDListFromPath( HWND hwndOwner, LPCTSTR pszPath, LPITEMIDLIST *ppid
if ( FAILED(hResult) ) if ( FAILED(hResult) )
return hResult; return hResult;
ULONG chEaten = lstrlen( pszPath ); WIN_ULONG chEaten = lstrlen( pszPath );
DWORD dwAttributes = FILE_ATTRIBUTE_DIRECTORY; DWORD dwAttributes = FILE_ATTRIBUTE_DIRECTORY;
#ifdef UNICODE #ifdef UNICODE
LPOLESTR wszPath = pszPath; LPOLESTR wszPath = pszPath;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment