diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c index 13a2bfe8cad..563892f402e 100644 --- a/bin/sh/jobs.c +++ b/bin/sh/jobs.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: jobs.c,v 1.14 1997/05/19 00:18:42 steve Exp $ + * $Id: jobs.c,v 1.15 1997/05/24 21:04:55 steve Exp $ */ #ifndef lint @@ -81,10 +81,10 @@ static char const sccsid[] = "@(#)jobs.c 8.5 (Berkeley) 5/4/95"; struct job *jobtab; /* array of jobs */ int njobs; /* size of array */ -MKINIT short backgndpid = -1; /* pid of last background process */ +MKINIT pid_t backgndpid = -1; /* pid of last background process */ #if JOBS int initialpgrp; /* pgrp of shell on invocation */ -short curjob; /* current job */ +int curjob; /* current job */ #endif #if JOBS @@ -174,6 +174,7 @@ setjobctl(on) #ifdef mkinit +INCLUDE INCLUDE SHELLPROC { diff --git a/bin/sh/jobs.h b/bin/sh/jobs.h index 8b13bc3adc4..6e5859d2d4b 100644 --- a/bin/sh/jobs.h +++ b/bin/sh/jobs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)jobs.h 8.2 (Berkeley) 5/4/95 - * $Id$ + * $Id: jobs.h,v 1.5 1997/02/22 13:58:29 peter Exp $ */ /* Mode argument to forkshell. Don't change FORK_FG or FORK_BG. */ @@ -51,8 +51,8 @@ */ struct procstat { - short pid; /* process id */ - short status; /* status flags (defined above) */ + pid_t pid; /* process id */ + int status; /* status flags (defined above) */ char *cmd; /* text of command being run */ }; @@ -75,7 +75,7 @@ struct job { #endif }; -extern short backgndpid; /* pid of last background process */ +extern pid_t backgndpid; /* pid of last background process */ extern int job_warning; /* user was warned about stopped jobs */ void setjobctl __P((int));