diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-23 00:34:03 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-23 00:54:04 +0200 |
| commit | 8b6ca219b79f97d6f32b6ca3f1ec8f4bf68ad741 (patch) | |
| tree | 6db4a40c6f24c54b310b639315dcb933261e2274 /tools | |
| parent | Hide also ULONG while including <windows.h> (diff) | |
| download | core-8b6ca219b79f97d6f32b6ca3f1ec8f4bf68ad741.tar.gz core-8b6ca219b79f97d6f32b6ca3f1ec8f4bf68ad741.zip | |
Define ULONG as WIN_ULONG while including shlobj.h
To match what prewin.h/postwin.h do.
Diffstat (limited to 'tools')
| -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; |