Attachment #8359 for bug #15830

View | Details | Raw Unified | Return to bug 15830
Collapse All | Expand All




# include <stdlib.h>
# endif

# if !defined(OS_BSDI) && \
     !defined(OS_FREEBSD) && \
     !defined(OS_NEXT) && \
     !defined(OS_MACHTEN) && \
     !defined(OS_MACOSX) && \
     !defined(OS_RHAPSODY) && \
     !defined(OS_MVS)
# include <malloc.h>
# endif

# endif 


 * OSPLAT definitions - suppressed when it's a one-of-a-kind
 */


     defined( PPC ) || \
     defined( ppc ) || \
     defined( __powerpc__ ) || \
     defined( __ppc__ )
# define OSPLAT "OSPLAT=PPC"
# endif

# if defined( _ALPHA_ ) || \
     defined( __alpha__ )
# define OSPLAT "OSPLAT=AXP"
# endif

# if defined( _i386_ ) || \
     defined( __i386__ ) || \
     defined( _M_IX86 )
# if !defined( OS_FREEBSD ) && \
     !defined( OS_OS2 ) && \
     !defined( OS_AS400 )
# define OSPLAT "OSPLAT=X86"
# endif
# endif 

# ifdef __sparc__
# if !defined( OS_SUNOS ) && \

# define OSPLAT "OSPLAT=ARM"
# endif

# if defined( __ia64__ ) || \
     defined( __IA64__ ) || \
     defined( _M_IA64 )
# define OSPLAT "OSPLAT=IA64"
# endif

# ifdef __s390__
# define OSPLAT "OSPLAT=390"
# endif





# ifdef USE_FILEUNIX

# if defined( OS_SEQUENT ) || \
     defined( OS_DGUX ) || \
     defined( OS_SCO ) || \
     defined( OS_ISC ) 
# define PORTAR 1
# endif

# if defined( OS_RHAPSODY ) || \
     defined( OS_MACOSX ) || \
     defined( OS_NEXT )
/* need unistd for rhapsody's proper lseek */
# include <sys/dir.h>
# include <unistd.h>
# define STRUCT_DIRENT struct direct 
# else
# include <dirent.h>
# define STRUCT_DIRENT struct dirent 
# endif

# ifdef OS_COHERENT
# include <arcoff.h>
# define HAVE_AR
# endif

# if defined( OS_MVS ) || \
     defined( OS_INTERIX ) || defined(OS_AIX)

#define	ARMAG	"!<arch>\n"
#define	SARMAG	8
#define	ARFMAG	"`\n"

struct ar_hdr		/* archive file member header - printable ascii */
{
	char	ar_name[16];	/* file member name - `/' terminated */
	char	ar_date[12];	/* file member date - decimal */
	char	ar_uid[6];	/* file member user id - decimal */
	char	ar_gid[6];	/* file member group id - decimal */
	char	ar_mode[8];	/* file member mode - octal */
	char	ar_size[10];	/* file member size - decimal */
	char	ar_fmag[2];	/* ARFMAG - string to end header */
};

# define HAVE_AR
# endif

# if defined( OS_QNX ) || \
     defined( OS_BEOS ) || \
     defined( OS_MPEIX )
# define NO_AR
# define HAVE_AR
# endif

# ifndef HAVE_AR
# include <ar.h>
# endif	

Return to bug 15830

Lines 373-387 Link Here

(-)jam.h (-35 / +1 lines)
373	# include <stdlib.h>	373	# include <stdlib.h>
374	# endif	374	# endif
375		375
376	# if !defined(OS_BSDI) && \
377	!defined(OS_FREEBSD) && \
378	!defined(OS_NEXT) && \
379	!defined(OS_MACHTEN) && \
380	!defined(OS_MACOSX) && \
381	!defined(OS_RHAPSODY) && \
382	!defined(OS_MVS)
383	# include <malloc.h>	376	# include <malloc.h>
384	# endif
385		377
386	# endif	378	# endif
387		379
Lines 389-416 Link Here
389	* OSPLAT definitions - suppressed when it's a one-of-a-kind	381	* OSPLAT definitions - suppressed when it's a one-of-a-kind
390	*/	382	*/
391		383
392	# if defined( _M_PPC ) \|\| \	384
393	defined( PPC ) \|\| \
394	defined( ppc ) \|\| \
395	defined( __powerpc__ ) \|\| \
396	defined( __ppc__ )
397	# define OSPLAT "OSPLAT=PPC"
398	# endif
399
400	# if defined( _ALPHA_ ) \|\| \
401	defined( __alpha__ )
402	# define OSPLAT "OSPLAT=AXP"
403	# endif
404
405	# if defined( _i386_ ) \|\| \
406	defined( __i386__ ) \|\| \
407	defined( _M_IX86 )
408	# if !defined( OS_FREEBSD ) && \
409	!defined( OS_OS2 ) && \
410	!defined( OS_AS400 )
411	# define OSPLAT "OSPLAT=X86"	385	# define OSPLAT "OSPLAT=X86"
412	# endif
413	# endif
414		386
415	# ifdef __sparc__	387	# ifdef __sparc__
416	# if !defined( OS_SUNOS ) && \	388	# if !defined( OS_SUNOS ) && \
Lines 429-440 Link Here
429	# define OSPLAT "OSPLAT=ARM"	401	# define OSPLAT "OSPLAT=ARM"
430	# endif	402	# endif
431		403
432	# if defined( __ia64__ ) \|\| \
433	defined( __IA64__ ) \|\| \
434	defined( _M_IA64 )
435	# define OSPLAT "OSPLAT=IA64"
436	# endif
437
438	# ifdef __s390__	404	# ifdef __s390__
439	# define OSPLAT "OSPLAT=390"	405	# define OSPLAT "OSPLAT=390"
440	# endif	406	# endif

Lines 10-67 Link Here

(-)fileunix.c (-44 lines)
10		10
11	# ifdef USE_FILEUNIX	11	# ifdef USE_FILEUNIX
12		12
13	# if defined( OS_SEQUENT ) \|\| \
14	defined( OS_DGUX ) \|\| \
15	defined( OS_SCO ) \|\| \
16	defined( OS_ISC )
17	# define PORTAR 1
18	# endif
19
20	# if defined( OS_RHAPSODY ) \|\| \
21	defined( OS_MACOSX ) \|\| \
22	defined( OS_NEXT )
23	/* need unistd for rhapsody's proper lseek */
24	# include <sys/dir.h>
25	# include <unistd.h>
26	# define STRUCT_DIRENT struct direct
27	# else
28	# include <dirent.h>	13	# include <dirent.h>
29	# define STRUCT_DIRENT struct dirent	14	# define STRUCT_DIRENT struct dirent
30	# endif
31		15
32	# ifdef OS_COHERENT	16	# ifdef OS_COHERENT
33	# include <arcoff.h>	17	# include <arcoff.h>
34	# define HAVE_AR	18	# define HAVE_AR
35	# endif	19	# endif
36		20
37	# if defined( OS_MVS ) \|\| \
38	defined( OS_INTERIX ) \|\| defined(OS_AIX)
39
40	#define ARMAG "!<arch>\n"
41	#define SARMAG 8
42	#define ARFMAG "`\n"
43
44	struct ar_hdr /* archive file member header - printable ascii */
45	{
46	char ar_name[16]; /* file member name - `/' terminated */
47	char ar_date[12]; /* file member date - decimal */
48	char ar_uid[6]; /* file member user id - decimal */
49	char ar_gid[6]; /* file member group id - decimal */
50	char ar_mode[8]; /* file member mode - octal */
51	char ar_size[10]; /* file member size - decimal */
52	char ar_fmag[2]; /* ARFMAG - string to end header */
53	};
54
55	# define HAVE_AR
56	# endif
57
58	# if defined( OS_QNX ) \|\| \
59	defined( OS_BEOS ) \|\| \
60	defined( OS_MPEIX )
61	# define NO_AR
62	# define HAVE_AR
63	# endif
64
65	# ifndef HAVE_AR	21	# ifndef HAVE_AR
66	# include <ar.h>	22	# include <ar.h>
67	# endif	23	# endif