summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2015-06-03 06:39:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-03 07:03:03 (GMT)
commit414382fb00c72babe2b22ef0fa757ea7c960f5ce (patch)
tree8b7dda5f0405a211fd026573f487a6ca9214f527 /notes-merge.c
parent282616c72d1d08a77ca4fe1186cb708c38408d87 (diff)
downloadgit-414382fb00c72babe2b22ef0fa757ea7c960f5ce.zip
git-414382fb00c72babe2b22ef0fa757ea7c960f5ce.tar.gz
git-414382fb00c72babe2b22ef0fa757ea7c960f5ce.tar.bz2
ewah/bitmap: silence warning about MASK macro redefinition
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 -> sys/sysctl.h -> sys/ucred.h -> sys/param.h -> machine/param.h -> ppc/param.h Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions