diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/jobs.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 71c7ee5b8..78b9bf491 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-12-06 Peter Stephenson <pws@csr.com> + + * unposted: Src/jobs.c: rename waitjob() to zwaitjob() to avoid + clash with IRIX system function. + 2000-12-06 Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru> * 13243: Makefile.in: we do not use Makefile in Completion and diff --git a/Src/jobs.c b/Src/jobs.c index 28246d422..966263645 100644 --- a/Src/jobs.c +++ b/Src/jobs.c @@ -890,7 +890,7 @@ waitforpid(pid_t pid) /**/ static void -waitjob(int job, int sig) +zwaitjob(int job, int sig) { Job jn = jobtab + job; @@ -937,7 +937,7 @@ waitjobs(void) Job jn = jobtab + thisjob; if (jn->procs) - waitjob(thisjob, 0); + zwaitjob(thisjob, 0); else { deletejob(jn); pipestats[0] = lastval; @@ -1276,7 +1276,7 @@ bin_fg(char *name, char **argv, char *ops, int func) } else { /* Must be BIN_WAIT, so wait for all jobs */ for (job = 0; job != MAXJOB; job++) if (job != thisjob && jobtab[job].stat) - waitjob(job, SIGINT); + zwaitjob(job, SIGINT); return 0; } } @@ -1367,7 +1367,7 @@ bin_fg(char *name, char **argv, char *ops, int func) killjb(jobtab + job, SIGCONT); } if (func == BIN_WAIT) - waitjob(job, SIGINT); + zwaitjob(job, SIGINT); if (func != BIN_BG) { waitjobs(); retval = lastval2; |