summaryrefslogtreecommitdiff
path: root/ewah/ewok.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-24 19:21:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-24 19:21:44 (GMT)
commit6da9f888daab2d18c1e5ae8252f631d38fb80e8a (patch)
tree4a99ad47fa7522e2805c3bbf8b631bbd823eef5e /ewah/ewok.h
parent3c84c38dac9c938e69aab4fa973a8dc944200d98 (diff)
parent34b935c01f28d34f6764f0e1140ad47e7abdde1b (diff)
downloadgit-6da9f888daab2d18c1e5ae8252f631d38fb80e8a.zip
git-6da9f888daab2d18c1e5ae8252f631d38fb80e8a.tar.gz
git-6da9f888daab2d18c1e5ae8252f631d38fb80e8a.tar.bz2
Merge branch 'es/osx-header-pollutes-mask-macro'
* es/osx-header-pollutes-mask-macro: ewah: use less generic macro name ewah/bitmap: silence warning about MASK macro redefinition
Diffstat (limited to 'ewah/ewok.h')
-rw-r--r--ewah/ewok.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ewah/ewok.h b/ewah/ewok.h
index e732525..6e2c5e1 100644
--- a/ewah/ewok.h
+++ b/ewah/ewok.h
@@ -32,7 +32,7 @@
struct strbuf;
typedef uint64_t eword_t;
-#define BITS_IN_WORD (sizeof(eword_t) * 8)
+#define BITS_IN_EWORD (sizeof(eword_t) * 8)
/**
* Do not use __builtin_popcountll. The GCC implementation