Kaydet (Commit) c5f45ade authored tarafından Tor Lillqvist's avatar Tor Lillqvist

More WIN_FOO cleanup

üst 7851d635
......@@ -34,10 +34,6 @@
#undef PolyPolygon
#undef Polygon
#undef Rectangle
#undef ULONG
#undef sal_Bool
#undef BYTE
#undef BOOL
#undef DELETE
/* Hilfe-Ids umbenennen */
......
......@@ -33,7 +33,6 @@
#if defined WNT
#define ULONG WIN_ULONG
#define Rectangle BLA_Rectangle
#define Polygon BLA_Polygon
#define PolyPolygon BLA_PolyPolygon
......
......@@ -567,9 +567,7 @@ 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
......@@ -608,7 +606,7 @@ HRESULT SHGetIDListFromPath( HWND hwndOwner, LPCTSTR pszPath, LPITEMIDLIST *ppid
if ( FAILED(hResult) )
return hResult;
WIN_ULONG chEaten = lstrlen( pszPath );
ULONG chEaten = lstrlen( pszPath );
DWORD dwAttributes = FILE_ATTRIBUTE_DIRECTORY;
#ifdef UNICODE
......
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