[patch] Temporary x86 fix.

jam_old_gcc.diff (text/plain), 2.83 KB, created by Thomas Nilsson on 2003-02-17 03:58:55 UTC

--- jam.h	2002-03-20 18:40:21.000000000 +0100
+++ /jam.h_mod	2003-02-17 09:55:10.000000000 +0100
@@ -373,15 +373,7 @@
 # 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 
 
@@ -389,28 +381,8 @@
  * OSPLAT definitions - suppressed when it's a one-of-a-kind
  */
 
-# if defined( _M_PPC ) || \
-     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 ) && \
@@ -429,12 +401,6 @@
 # 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
--- fileunix.c	2002-01-12 01:14:49.000000000 +0100
+++ /fileunix.c_mod	2003-02-17 09:54:59.000000000 +0100
@@ -10,58 +10,14 @@
 
 # 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