summaryrefslogtreecommitdiff
path: root/usr.bin/make
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2020-01-13 16:03:45 +0000
committerMarc Espie <espie@cvs.openbsd.org>2020-01-13 16:03:45 +0000
commit198bb68ab742fb66df53852aefb527b89747403d (patch)
tree621117a1e9e0430e36d16b9209154f2ba9b5b8a1 /usr.bin/make
parentb9e275236121dae10332d437e4b09440fa665a36 (diff)
move function around to minimize conflicts
Diffstat (limited to 'usr.bin/make')
-rw-r--r--usr.bin/make/job.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index 680c870b3dd..a1334c17138 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: job.c,v 1.157 2020/01/13 15:55:57 espie Exp $ */
+/* $OpenBSD: job.c,v 1.158 2020/01/13 16:03:44 espie Exp $ */
/* $NetBSD: job.c,v 1.16 1996/11/06 17:59:08 christos Exp $ */
/*
@@ -660,6 +660,22 @@ may_continue_job(Job *job)
}
}
+static void
+may_continue_heldback_jobs()
+{
+ while (!no_new_jobs) {
+ if (heldJobs != NULL) {
+ Job *job = heldJobs;
+ heldJobs = heldJobs->next;
+ if (DEBUG(EXPENSIVE))
+ fprintf(stderr, "[%ld] cheap -> release %s\n",
+ (long)mypid, job->node->name);
+ may_continue_job(job);
+ } else
+ break;
+ }
+}
+
/*-
*-----------------------------------------------------------------------
* Job_Make --
@@ -700,22 +716,6 @@ determine_job_next_step(Job *job)
may_continue_job(job);
}
-static void
-may_continue_heldback_jobs()
-{
- while (!no_new_jobs) {
- if (heldJobs != NULL) {
- Job *job = heldJobs;
- heldJobs = heldJobs->next;
- if (DEBUG(EXPENSIVE))
- fprintf(stderr, "[%ld] cheap -> release %s\n",
- (long)mypid, job->node->name);
- may_continue_job(job);
- } else
- break;
- }
-}
-
/*
* job = reap_finished_job(pid):
* retrieve and remove a job from runningJobs, based on its pid