From: Martin Mares <mj@ucw.cz>
Date: Fri, 3 Jan 2014 12:55:12 +0000 (+0100)
Subject: ABI: Avoid macro re-definition
X-Git-Tag: v5.99~50^2~12
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=e84017be8cf6330159b3c80f1860077f867b8f5b;p=libucw.git

ABI: Avoid macro re-definition
---

diff --git a/ucw/hashfunc.h b/ucw/hashfunc.h
index 4453d536..b2b03e94 100644
--- a/ucw/hashfunc.h
+++ b/ucw/hashfunc.h
@@ -30,7 +30,10 @@ uns str_len_aligned(const char *str) PURE; /** Get the string length (not a real
 uns hash_string_aligned(const char *str) PURE; /** Hash the string. The string must be aligned to sizeof(uns). For unaligned see @hash_string(). **/
 uns hash_block_aligned(const byte *buf, uns len) PURE; /** Hash arbitrary data. They must be aligned to sizeof(uns). For unaligned see @hash_block(). **/
 
-#ifdef	CPU_ALLOW_UNALIGNED
+#ifdef CPU_ALLOW_UNALIGNED
+#undef str_len
+#undef hash_string
+#undef hash_block
 #define	str_len(str)		str_len_aligned(str)
 #define	hash_string(str)	hash_string_aligned(str)
 #define	hash_block(str, len)	hash_block_aligned(str, len)