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). > > Boyd, does this make any of the earlier symbols you added redundant? On my machine !defined(__USLC__) covers both UnixWare 7.1.4 and OpenServer 6.0.0. !defined(_M_UNIX) covers my OpenServer 5.0.7 machine. The !defined(__USLC__) also covers my Novell OS's and others that use the USLC (Unix System Labotories Compiler). > > 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 > -- 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
