summaryrefslogtreecommitdiffstats
path: root/lib/lz4.c
diff options
context:
space:
mode:
authorYann Collet <cyan@fb.com>2022-01-29 05:24:12 (GMT)
committerYann Collet <cyan@fb.com>2022-01-29 05:24:12 (GMT)
commit77bef0969357d835763763dd1a16129445b96a37 (patch)
tree1e20a148b20459f6b47cef0741d11370c03e3448 /lib/lz4.c
parent573fa33d1d2793da996eb6edad820c67439ce6a0 (diff)
downloadlz4-77bef0969357d835763763dd1a16129445b96a37.zip
lz4-77bef0969357d835763763dd1a16129445b96a37.tar.gz
lz4-77bef0969357d835763763dd1a16129445b96a37.tar.bz2
renamed unaligned -> LZ4_unaligned
better name space isolation suggested by @boris-kolpackov in #1053
Diffstat (limited to 'lib/lz4.c')
-rw-r--r--lib/lz4.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/lz4.c b/lib/lz4.c
index 6a02ef5..95bd349 100644
--- a/lib/lz4.c
+++ b/lib/lz4.c
@@ -343,14 +343,14 @@ static void LZ4_write32(void* memPtr, U32 value) { *(U32*)memPtr = value; }
/* __pack instructions are safer, but compiler specific, hence potentially problematic for some compilers */
/* currently only defined for gcc and icc */
-typedef union { U16 u16; U32 u32; reg_t uArch; } __attribute__((packed)) unalign;
+typedef union { U16 u16; U32 u32; reg_t uArch; } __attribute__((packed)) LZ4_unalign;
-static U16 LZ4_read16(const void* ptr) { return ((const unalign*)ptr)->u16; }
-static U32 LZ4_read32(const void* ptr) { return ((const unalign*)ptr)->u32; }
-static reg_t LZ4_read_ARCH(const void* ptr) { return ((const unalign*)ptr)->uArch; }
+static U16 LZ4_read16(const void* ptr) { return ((const LZ4_unalign*)ptr)->u16; }
+static U32 LZ4_read32(const void* ptr) { return ((const LZ4_unalign*)ptr)->u32; }
+static reg_t LZ4_read_ARCH(const void* ptr) { return ((const LZ4_unalign*)ptr)->uArch; }
-static void LZ4_write16(void* memPtr, U16 value) { ((unalign*)memPtr)->u16 = value; }
-static void LZ4_write32(void* memPtr, U32 value) { ((unalign*)memPtr)->u32 = value; }
+static void LZ4_write16(void* memPtr, U16 value) { ((LZ4_unalign*)memPtr)->u16 = value; }
+static void LZ4_write32(void* memPtr, U32 value) { ((LZ4_unalign*)memPtr)->u32 = value; }
#else /* safe and portable access using memcpy() */