From a0ab37fcd61ee7199b99b5ed916cc4205d8e9093 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 16 Dec 1993 23:24:39 +0000 Subject: Formerly arscan.c.~32~ --- arscan.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'arscan.c') diff --git a/arscan.c b/arscan.c index 7352785..f3bb3ce 100644 --- a/arscan.c +++ b/arscan.c @@ -25,6 +25,11 @@ #ifndef NO_ARCHIVES +/* SCO Unix's compiler defines both of these. */ +#ifdef M_UNIX +#undef M_XENIX +#endif + /* On the sun386i and in System V rel 3, ar.h defines two different archive formats depending upon whether you have defined PORTAR (normal) or PORT5AR (System V Release 1). There is no default, one or the other must be defined @@ -32,8 +37,15 @@ #if (!defined (PORTAR) || PORTAR == 0) && (!defined (PORT5AR) || PORT5AR == 0) #undef PORTAR +#ifdef M_XENIX +/* According to Jim Sievert , for SCO XENIX defining + PORTAR to 1 gets the wrong archive format, and defining it to 0 gets the + right one. */ +#define PORTAR 0 +#else #define PORTAR 1 #endif +#endif #include @@ -41,11 +53,6 @@ #ifndef AR_HDR_SIZE #define AR_HDR_SIZE (sizeof (struct ar_hdr)) #endif - -/* SCO Unix's compiler defines both of these. */ -#ifdef M_UNIX -#undef M_XENIX -#endif /* Takes three arguments ARCHIVE, FUNCTION and ARG. -- cgit v1.2.3