On Apr 17, 2012, at 2:06 PM, Junio C Hamano wrote: > Junio C Hamano <gitster@xxxxxxxxx> writes: > >> Unfortunate. OS X shouldn't contaminate the user namespace by adding such >> names in stdlib.h (which incidentally has qsort()), but the damage is done >> already, so I am not opposed to rename it to llist_mergesort() or something. > > Something like this. While we are touching the code, let's add some > documentation to the header. > > commit.c | 4 ++-- > mergesort.c | 8 ++++---- > mergesort.h | 16 ++++++++++++---- > test-mergesort.c | 2 +- > 4 files changed, 19 insertions(+), 11 deletions(-) This is basically identical to what I was going to send and it does, in fact, fix my build problem. Thanks, ~~ Brian Gernhardt -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html