Re: [BUG] daemon.c blows up on OSX
- From
Junio C Hamano <junkio@cox.net>
- Date
- Dec 21, 2006, 01:48 UTC
- Message-ID
- <7v64c63tol.fsf@assigned-by-dhcp.cox.net>
- In-Reply-To
- <86psaevxo3.fsf@blue.stonehenge.com>
merlyn@stonehenge.com (Randal L. Schwartz) writes:
Show 8 quoted lines
>>> I tried the moral equivalent of that, and it failed to compile many >>> other things then. So that's not it. > ... > I did it with #if 0 / #end instead of the __APPLE_CC__ symbol. > But, weirdly, now that I used the symbol, I get a good compile. > ... > Sorry for being objectionable earlier then. I've attached the precise > patch I used and works and verified.
Just to make sure... the attached looks exactly what Terje's patch would have been before the whitespace damage. Can I take this as confirmation that the patch works for you and Terje?
I wonder what the earlier failure you got from "the moral equivalent" was -- I hope it is not an indication that we have a dependency bug in our Makefile somewhere.
Thanks.
Show 17 quoted lines
> diff --git a/git-compat-util.h b/git-compat-util.h > index bc296b3..41fa7f6 100644 > --- a/git-compat-util.h > +++ b/git-compat-util.h > @@ -11,8 +11,10 @@ > > #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) > > +#ifndef __APPLE_CC__ > #define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */ > #define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */ > +#endif > #define _GNU_SOURCE > #define _BSD_SOURCE > > -- > 1.4.4.3.g9e3f8