ewah/bitmap: silence warning about MASK macro redefinition

sunshineco · gitster · commit 414382fb00c7 · 2015-06-03T00:03:03.000-07:00
On PowerPC Mac OS X (10.5.8 "Leopard" with Xcode 3.1),
system header /usr/include/ppc/param.h[1] pollutes the
preprocessor namespace with a macro generically named MASK.
This conflicts with the same-named macro in ewah/bitmap.c.
We can avoid this conflict by using a more specific name.

[1]: Included indirectly via:
     git-compat-util.h -&gt;
     sys/sysctl.h -&gt;
     sys/ucred.h -&gt;
     sys/param.h -&gt;
     machine/param.h -&gt;
     ppc/param.h

Signed-off-by: Eric Sunshine &lt;sunshine@sunshineco.com&gt;
Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/ewah/bitmap.c b/ewah/bitmap.c
@@ -20,8 +20,8 @@
 #include "git-compat-util.h"
 #include "ewok.h"
 
-#define MASK(x) ((eword_t)1 << (x % BITS_IN_WORD))
-#define BLOCK(x) (x / BITS_IN_WORD)
+#define EWAH_MASK(x) ((eword_t)1 << (x % BITS_IN_WORD))
+#define EWAH_BLOCK(x) (x / BITS_IN_WORD)
 
 struct bitmap *bitmap_new(void)
 {
@@ -33,7 +33,7 @@ struct bitmap *bitmap_new(void)
 
 void bitmap_set(struct bitmap *self, size_t pos)
 {
-	size_t block = BLOCK(pos);
+	size_t block = EWAH_BLOCK(pos);
 
 	if (block >= self->word_alloc) {
 		size_t old_size = self->word_alloc;
@@ -45,22 +45,22 @@ void bitmap_set(struct bitmap *self, size_t pos)
 			(self->word_alloc - old_size) * sizeof(eword_t));
 	}
 
-	self->words[block] |= MASK(pos);
+	self->words[block] |= EWAH_MASK(pos);
 }
 
 void bitmap_clear(struct bitmap *self, size_t pos)
 {
-	size_t block = BLOCK(pos);
+	size_t block = EWAH_BLOCK(pos);
 
 	if (block < self->word_alloc)
-		self->words[block] &= ~MASK(pos);
+		self->words[block] &= ~EWAH_MASK(pos);
 }
 
 int bitmap_get(struct bitmap *self, size_t pos)
 {
-	size_t block = BLOCK(pos);
+	size_t block = EWAH_BLOCK(pos);
 	return block < self->word_alloc &&
-		(self->words[block] & MASK(pos)) != 0;
+		(self->words[block] & EWAH_MASK(pos)) != 0;
 }
 
 struct ewah_bitmap *bitmap_to_ewah(struct bitmap *bitmap)

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@`
`20`	`20`	`#include "git-compat-util.h"`
`21`	`21`	`#include "ewok.h"`
`22`	`22`
`23`		`-#define MASK(x) ((eword_t)1 << (x % BITS_IN_WORD))`
`24`		`-#define BLOCK(x) (x / BITS_IN_WORD)`
	`23`	`+#define EWAH_MASK(x) ((eword_t)1 << (x % BITS_IN_WORD))`
	`24`	`+#define EWAH_BLOCK(x) (x / BITS_IN_WORD)`
`25`	`25`
`26`	`26`	`struct bitmap *bitmap_new(void)`
`27`	`27`	`{`
`@@ -33,7 +33,7 @@ struct bitmap *bitmap_new(void)`
`33`	`33`
`34`	`34`	`void bitmap_set(struct bitmap *self, size_t pos)`
`35`	`35`	`{`
`36`		`- size_t block = BLOCK(pos);`
	`36`	`+ size_t block = EWAH_BLOCK(pos);`
`37`	`37`
`38`	`38`	`if (block >= self->word_alloc) {`
`39`	`39`	`size_t old_size = self->word_alloc;`
`@@ -45,22 +45,22 @@ void bitmap_set(struct bitmap *self, size_t pos)`
`45`	`45`	`(self->word_alloc - old_size) * sizeof(eword_t));`
`46`	`46`	`}`
`47`	`47`
`48`		`- self->words[block] \|= MASK(pos);`
	`48`	`+ self->words[block] \|= EWAH_MASK(pos);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`void bitmap_clear(struct bitmap *self, size_t pos)`
`52`	`52`	`{`
`53`		`- size_t block = BLOCK(pos);`
	`53`	`+ size_t block = EWAH_BLOCK(pos);`
`54`	`54`
`55`	`55`	`if (block < self->word_alloc)`
`56`		`- self->words[block] &= ~MASK(pos);`
	`56`	`+ self->words[block] &= ~EWAH_MASK(pos);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`int bitmap_get(struct bitmap *self, size_t pos)`
`60`	`60`	`{`
`61`		`- size_t block = BLOCK(pos);`
	`61`	`+ size_t block = EWAH_BLOCK(pos);`
`62`	`62`	`return block < self->word_alloc &&`
`63`		`- (self->words[block] & MASK(pos)) != 0;`
	`63`	`+ (self->words[block] & EWAH_MASK(pos)) != 0;`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`struct ewah_bitmap bitmap_to_ewah(struct bitmap bitmap)`