Merge branch 'es/worktree-add' into maint

diff --git a/ewah/ewok.h b/ewah/ewok.h
index e73252536702aaf9fed17757937fbaf4b4593f91..6e2c5e1e3d4475b31ba3c556b31b9d5d72e26d59 100644 (file)
--- 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