from sun

SCCS-vsn: old/make/files.c 4.6

diff --git a/usr/src/old/make/files.c b/usr/src/old/make/files.c
index cb296e4..40f4c16 100644 (file)
--- a/usr/src/old/make/files.c
+++ b/usr/src/old/make/files.c
@@ -1,4 +1,4 @@
-static char *sccsid = "@(#)files.c     4.5 (Berkeley) 82/06/17";
+static char *sccsid = "@(#)files.c     4.6 (Berkeley) 83/02/09";

 /* UNIX DEPENDENT PROCEDURES */
 
 
 /* UNIX DEPENDENT PROCEDURES */
 
 


@@ -18,7 +18,7 @@ char *builtin[] =
        "LEX=lex",
        "LFLAGS=",
        "CC=cc",
        "LEX=lex",
        "LFLAGS=",
        "CC=cc",

-#ifdef vax
+#if defined(vax) || defined(sun)

        "AS=as",
 #else
        "AS=as -",
        "AS=as",
 #else
        "AS=as -",


@@ -147,11 +147,7 @@ for(s = filename ; *s!='\0' && *s!='(' ; ++s)
 if(*s == '(')
        return(lookarch(filename));
 
 if(*s == '(')
        return(lookarch(filename));
 

-#if vax

 if (stat(filename, &buf) < 0)
 if (stat(filename, &buf) < 0)

-#else
-if(stat(filename,&buf) < 0) 
-#endif

        return(0);
 else   return(buf.st_mtime);
 }
        return(0);
 else   return(buf.st_mtime);
 }


@@ -517,7 +513,7 @@ fread( (char *) &objhead, sizeof(objhead), 1, arfd);
 if (N_BADMAG(objhead))
        fatal1("%s is not an object module", arfname);
 skip = objhead.a_text + objhead.a_data;
 if (N_BADMAG(objhead))
        fatal1("%s is not an object module", arfname);
 skip = objhead.a_text + objhead.a_data;

-#ifdef vax
+#if defined(vax) || defined(sun)

 skip += objhead.a_trsize + objhead.a_drsize;
 #else
 if(! objhead.a_flag )
 skip += objhead.a_trsize + objhead.a_drsize;
 #else
 if(! objhead.a_flag )