Austin English : ole32: Rename a macro to prevent a conflict on NetBSD.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2fe86fb7cd9cac04e6ba5e555f6c8d10107f6575
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2fe86fb7cd9cac04e6ba5e555f...

Author: Austin English 
Date:   Thu Apr 23 11:17:49 2009 -0500

ole32: Rename a macro to prevent a conflict on NetBSD.

---

dlls/ole32/stg_prop.c  |    2 +-
 dlls/ole32/storage32.c |    6 +++---
 dlls/ole32/storage32.h |    8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c
index 4b1c9c5..381e079 100644
--- a/dlls/ole32/stg_prop.c
+++ b/dlls/ole32/stg_prop.c
@@ -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)
 {
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index 2111b90..90328f0 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -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)
diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h
index 1e40b3a..1e42afb 100644
--- a/dlls/ole32/storage32.h
+++ b/dlls/ole32/storage32.h
@@ -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