diff options
Diffstat (limited to 'svl/source/svdde/ddeimp.hxx')
-rw-r--r-- | svl/source/svdde/ddeimp.hxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx index 708b2736f9cf..62f41a307efc 100644 --- a/svl/source/svdde/ddeimp.hxx +++ b/svl/source/svdde/ddeimp.hxx @@ -32,11 +32,11 @@ #include "ddemlos2.h" -#define WORD USHORT -#define DWORD ULONG -#define LPBYTE BYTE* -#define LPWORD USHORT* -#define LPDWORD ULONG* +#define WORD sal_uInt16 +#define DWORD sal_uIntPtr +#define LPBYTE sal_uInt8* +#define LPWORD sal_uInt16* +#define LPDWORD sal_uIntPtr* #define LPCTSTR PCSZ #else @@ -49,10 +49,10 @@ /* extern "C" { -#define BOOL WIN_BOOL -#define BYTE WIN_BYTE -#undef BOOL -#undef BYTE +#define sal_Bool WIN_BOOL +#define sal_uInt8 WIN_BYTE +#undef sal_Bool +#undef sal_uInt8 }; */ @@ -143,7 +143,7 @@ struct DdeDataImp HDDEDATA hData; LPBYTE pData; long nData; - ULONG nFmt; + sal_uIntPtr nFmt; }; class DdeConnections; @@ -151,15 +151,15 @@ class DdeServices; struct DdeInstData { - USHORT nRefCount; + sal_uInt16 nRefCount; DdeConnections* pConnections; // Server long hCurConvSvr; - ULONG hDdeInstSvr; + sal_uIntPtr hDdeInstSvr; short nInstanceSvr; DdeServices* pServicesSvr; // Client - ULONG hDdeInstCli; + sal_uIntPtr hDdeInstCli; short nInstanceCli; }; |