ole32: Rename a macro to prevent a conflict on NetBSD.
This commit is contained in:
parent
32924bd662
commit
2fe86fb7cd
|
@ -967,7 +967,7 @@ static void PropertyStorage_PropertyDestroy(void *k, void *d, void *extra)
|
|||
|
||||
#ifdef WORDS_BIGENDIAN
|
||||
/* Swaps each character in str to or from little endian; assumes the conversion
|
||||
* is symmetric, that is, that le16toh is equivalent to htole16.
|
||||
* is symmetric, that is, that lendian16toh is equivalent to htole16.
|
||||
*/
|
||||
static void PropertyStorage_ByteSwapString(LPWSTR str, size_t len)
|
||||
{
|
||||
|
|
|
@ -3472,7 +3472,7 @@ static BOOL StorageImpl_ReadDWordFromBigBlock(
|
|||
ulOffset.u.LowPart += offset;
|
||||
|
||||
StorageImpl_ReadAt(This, ulOffset, &tmp, sizeof(DWORD), &read);
|
||||
*value = le32toh(tmp);
|
||||
*value = lendian32toh(tmp);
|
||||
return (read == sizeof(DWORD));
|
||||
}
|
||||
|
||||
|
@ -4250,7 +4250,7 @@ void StorageUtl_ReadWord(const BYTE* buffer, ULONG offset, WORD* value)
|
|||
WORD tmp;
|
||||
|
||||
memcpy(&tmp, buffer+offset, sizeof(WORD));
|
||||
*value = le16toh(tmp);
|
||||
*value = lendian16toh(tmp);
|
||||
}
|
||||
|
||||
void StorageUtl_WriteWord(BYTE* buffer, ULONG offset, WORD value)
|
||||
|
@ -4264,7 +4264,7 @@ void StorageUtl_ReadDWord(const BYTE* buffer, ULONG offset, DWORD* value)
|
|||
DWORD tmp;
|
||||
|
||||
memcpy(&tmp, buffer+offset, sizeof(DWORD));
|
||||
*value = le32toh(tmp);
|
||||
*value = lendian32toh(tmp);
|
||||
}
|
||||
|
||||
void StorageUtl_WriteDWord(BYTE* buffer, ULONG offset, DWORD value)
|
||||
|
|
|
@ -376,15 +376,15 @@ StgStreamImpl* StgStreamImpl_Construct(
|
|||
|
||||
#define htole32(x) RtlUlongByteSwap(x)
|
||||
#define htole16(x) RtlUshortByteSwap(x)
|
||||
#define le32toh(x) RtlUlongByteSwap(x)
|
||||
#define le16toh(x) RtlUshortByteSwap(x)
|
||||
#define lendian32toh(x) RtlUlongByteSwap(x)
|
||||
#define lendian16toh(x) RtlUshortByteSwap(x)
|
||||
|
||||
#else
|
||||
|
||||
#define htole32(x) (x)
|
||||
#define htole16(x) (x)
|
||||
#define le32toh(x) (x)
|
||||
#define le16toh(x) (x)
|
||||
#define lendian32toh(x) (x)
|
||||
#define lendian16toh(x) (x)
|
||||
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue