summaryrefslogtreecommitdiffstats
path: root/lib/lz4.c
diff options
context:
space:
mode:
authorYann Collet <Cyan4973@users.noreply.github.com>2018-04-19 17:52:48 (GMT)
committerGitHub <noreply@github.com>2018-04-19 17:52:48 (GMT)
commitdede47f13b93091e23f4511482db1a150d42e3ff (patch)
tree7999704c35d5b6b9a25158945bde4a47a3723124 /lib/lz4.c
parentc6301479c5a85aa32d6060b3976995c1ad85a58f (diff)
parentea6ed46fc273a7b10870caeb515622737eb1c572 (diff)
downloadlz4-dede47f13b93091e23f4511482db1a150d42e3ff.zip
lz4-dede47f13b93091e23f4511482db1a150d42e3ff.tar.gz
lz4-dede47f13b93091e23f4511482db1a150d42e3ff.tar.bz2
Merge pull request #502 from lhacc1/dev
Wrap likely/unlikely macroses with #ifndef
Diffstat (limited to 'lib/lz4.c')
-rw-r--r--lib/lz4.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/lz4.c b/lib/lz4.c
index 33aa5c7..5fe5e97 100644
--- a/lib/lz4.c
+++ b/lib/lz4.c
@@ -147,8 +147,12 @@
# define expect(expr,value) (expr)
#endif
+#ifndef likely
#define likely(expr) expect((expr) != 0, 1)
+#endif
+#ifndef unlikely
#define unlikely(expr) expect((expr) != 0, 0)
+#endif
/*-************************************