diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-23 00:30:47 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-23 00:54:02 +0200 |
| commit | 8ff27501baa2b67e7d2c0165576105358bdd0f63 (patch) | |
| tree | 567145202e1d179ab4f35ea8e077f76e2c67fdfd | |
| parent | 3a1894b17ee94b8f5b4fda00ce1567491043abc6 (diff) | |
Hide also ULONG while including <windows.h>
LibreOffice's deprecated ULONG is sal_uIntPtr, and thus 64 bits on
64-bit Windows, unlike Windows's ULONG which is 32 bits on both 32-
and 64-bit Windows. So we must hide ULONG, too, to avoid compilation
errors on 64-bit Windows.
| -rw-r--r-- | tools/inc/tools/postwin.h | 1 | ||||
| -rw-r--r-- | tools/inc/tools/prewin.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/inc/tools/postwin.h b/tools/inc/tools/postwin.h index 5cffa3feb0e2..f3f21449d7f0 100644 --- a/tools/inc/tools/postwin.h +++ b/tools/inc/tools/postwin.h @@ -47,6 +47,7 @@ #undef UINT64 #undef INT32 #undef UINT32 +#undef ULONG #endif #undef Folder #undef GradientStyle_RECT diff --git a/tools/inc/tools/prewin.h b/tools/inc/tools/prewin.h index 8ced0bba8a78..90a19d32d992 100644 --- a/tools/inc/tools/prewin.h +++ b/tools/inc/tools/prewin.h @@ -37,6 +37,7 @@ #define UINT64 WIN_UINT64 #define INT32 WIN_INT32 #define UINT32 WIN_UINT32 +#define ULONG WIN_ULONG #endif #define Rectangle BLA_Rectangle |