mirror of
https://git.savannah.gnu.org/git/make.git
synced 2025-02-07 14:56:06 +00:00
Formerly arscan.c.~32~
This commit is contained in:
parent
65b8056203
commit
a0ab37fcd6
1 changed files with 12 additions and 5 deletions
17
arscan.c
17
arscan.c
|
@ -25,6 +25,11 @@
|
||||||
|
|
||||||
#ifndef NO_ARCHIVES
|
#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
|
/* 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
|
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
|
(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)
|
#if (!defined (PORTAR) || PORTAR == 0) && (!defined (PORT5AR) || PORT5AR == 0)
|
||||||
#undef PORTAR
|
#undef PORTAR
|
||||||
|
#ifdef M_XENIX
|
||||||
|
/* According to Jim Sievert <jas1@rsvl.unisys.com>, 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
|
#define PORTAR 1
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <ar.h>
|
#include <ar.h>
|
||||||
|
|
||||||
|
@ -41,11 +53,6 @@
|
||||||
#ifndef AR_HDR_SIZE
|
#ifndef AR_HDR_SIZE
|
||||||
#define AR_HDR_SIZE (sizeof (struct ar_hdr))
|
#define AR_HDR_SIZE (sizeof (struct ar_hdr))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* SCO Unix's compiler defines both of these. */
|
|
||||||
#ifdef M_UNIX
|
|
||||||
#undef M_XENIX
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Takes three arguments ARCHIVE, FUNCTION and ARG.
|
/* Takes three arguments ARCHIVE, FUNCTION and ARG.
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue