From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Jun 2015 19:21:44 +0000 (-0700)
Subject: Merge branch 'es/osx-header-pollutes-mask-macro'
X-Git-Tag: v2.5.0-rc0~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6da9f888daab2d18c1e5ae8252f631d38fb80e8a

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
---

6da9f888daab2d18c1e5ae8252f631d38fb80e8a
diff --cc ewah/ewok.h
index e732525367,7e311b3cd4..6e2c5e1e3d
--- a/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