From f4e48fe61d37feec8781e7dd51166d827bfe3ea7 Mon Sep 17 00:00:00 2001 From: "yann.collet.73@gmail.com" Date: Tue, 14 Aug 2012 16:27:47 +0000 Subject: changed some macro names in lz4hc to avoid duplicate definition on NetBSD git-svn-id: https://lz4.googlecode.com/svn/trunk@76 650e7d94-2a16-8b24-b05c-7c0b3f6821cd --- lz4hc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lz4hc.c b/lz4hc.c index 572ffb6..2ab507e 100644 --- a/lz4hc.c +++ b/lz4hc.c @@ -79,9 +79,9 @@ #endif #ifdef _MSC_VER // Visual Studio -#define bswap16(x) _byteswap_ushort(x) +#define lz4_bswap16(x) _byteswap_ushort(x) #else -#define bswap16(x) ((unsigned short int) ((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8))) +#define lz4_bswap16(x) ((unsigned short int) ((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8))) #endif @@ -182,8 +182,8 @@ typedef struct _U64_S { U64 v; } U64_S; #endif #if defined(LZ4_BIG_ENDIAN) -#define LZ4_READ_LITTLEENDIAN_16(d,s,p) { U16 v = A16(p); v = bswap16(v); d = (s) - v; } -#define LZ4_WRITE_LITTLEENDIAN_16(p,i) { U16 v = (U16)(i); v = bswap16(v); A16(p) = v; p+=2; } +#define LZ4_READ_LITTLEENDIAN_16(d,s,p) { U16 v = A16(p); v = lz4_bswap16(v); d = (s) - v; } +#define LZ4_WRITE_LITTLEENDIAN_16(p,i) { U16 v = (U16)(i); v = lz4_bswap16(v); A16(p) = v; p+=2; } #else // Little Endian #define LZ4_READ_LITTLEENDIAN_16(d,s,p) { d = (s) - A16(p); } #define LZ4_WRITE_LITTLEENDIAN_16(p,v) { A16(p) = v; p+=2; } -- cgit v0.12