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

diff --cc ewah/ewok.h
index e73252536702aaf9fed17757937fbaf4b4593f91,7e311b3cd42c458fe59867da60e6ae1b777e4d0a..6e2c5e1e3d4475b31ba3c556b31b9d5d72e26d59
--- 1/ewah/ewok.h
--- 2/ewah/ewok.h
+++ b/ewah/ewok.h
@@@ -30,9 -30,8 +30,9 @@@
  #     define ewah_calloc xcalloc
  #endif
  
 +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

diff --cc pack-bitmap.c
Simple merge