On Wed, 30 Jul 2008, Junio C Hamano wrote: > Aidan Van Dyk <aidan@xxxxxxxxxxx> writes: > > SCO OpenServer also hides the definitions of (at least) u_short and > > friends if _XOPEN_SOURCE is defined. > > I thought that was covered by 457bb45 (Port to 12 other Platforms., 2008-06-08). I thought it was covered as well. > Sign-off? > > Boyd, does this make any of the earlier symbols you added redundant? I have just tried this on 4 OpenServer 6.0 machines fresh installed and I do not need this added. I am trying to figure out what is different on his. It appears he is using the exact same version of the compiler as well. My uname -a gives me this... SCO_SV tech0 5 6.0.0 i386 and the gcc -V gives me the exact same compiler. So I do not know why he has to have the additional __OPENSERVER__. This does break my OpenServer 5.0.7 fresh install as well. So I would not use it. What I do not understand is why the !defined(__USLC__) does not catch it. It should. > > git-compat-util.h | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > diff --git a/git-compat-util.h b/git-compat-util.h > > index cf89cdf..42e3e0b 100644 > > --- a/git-compat-util.h > > +++ b/git-compat-util.h > > @@ -39,7 +39,7 @@ > > /* Approximation of the length of the decimal representation of this type. */ > > #define decimal_length(x) ((int)(sizeof(x) * 2.56 + 0.5) + 1) > > > > -#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__USLC__) && !defined(_M_UNIX) > > +#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__USLC__) && !defined(_M_UNIX) && !defined(__OPENSERVER__) > > #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 > > -- > > 1.6.0.rc1.dirty > -- > 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 > -- Boyd Gerber <gerberb@xxxxxxxxx> ZENEZ 1042 East Fort Union #135, Midvale Utah 84047 -- 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
