diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-03-16 21:33:04 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-03-16 21:33:04 +0200 |
| commit | c5f45ade775eca71753532ec28869533cb625b04 (patch) | |
| tree | 2a999f9f5caabcfdfb8c343edec706e9a279b968 /tools | |
| parent | 7851d6354750cbea9a278ca10eb8c9a10167b2e0 (diff) | |
More WIN_FOO cleanup
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/inc/tools/postsys.h | 4 | ||||
| -rw-r--r-- | tools/inc/tools/presys.h | 1 | ||||
| -rwxr-xr-x | tools/source/fsys/wntmsc.cxx | 4 |
3 files changed, 1 insertions, 8 deletions
diff --git a/tools/inc/tools/postsys.h b/tools/inc/tools/postsys.h index 60c83173d6e4..c31074c845ed 100644 --- a/tools/inc/tools/postsys.h +++ b/tools/inc/tools/postsys.h @@ -34,10 +34,6 @@ #undef PolyPolygon #undef Polygon #undef Rectangle -#undef ULONG -#undef sal_Bool -#undef BYTE -#undef BOOL #undef DELETE /* Hilfe-Ids umbenennen */ diff --git a/tools/inc/tools/presys.h b/tools/inc/tools/presys.h index fb88c7323019..3f71249b7cc5 100644 --- a/tools/inc/tools/presys.h +++ b/tools/inc/tools/presys.h @@ -33,7 +33,6 @@ #if defined WNT -#define ULONG WIN_ULONG #define Rectangle BLA_Rectangle #define Polygon BLA_Polygon #define PolyPolygon BLA_PolyPolygon diff --git a/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx index 2ddea1cbe540..babc17e107ea 100755 --- a/tools/source/fsys/wntmsc.cxx +++ b/tools/source/fsys/wntmsc.cxx @@ -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 |