diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-24 22:21:44 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-24 22:21:44 +0300 |
| commit | 6da9f888daab2d18c1e5ae8252f631d38fb80e8a (patch) | |
| tree | 4a99ad47fa7522e2805c3bbf8b631bbd823eef5e /ewah/ewok.h | |
| parent | 3c84c38dac9c938e69aab4fa973a8dc944200d98 (diff) | |
| parent | 34b935c01f28d34f6764f0e1140ad47e7abdde1b (diff) | |
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.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ewah/ewok.h b/ewah/ewok.h index e732525367..6e2c5e1e3d 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 |