diff options
author | Eli Zaretskii <eliz@gnu.org> | 2012-01-28 20:19:55 +0000 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2012-01-28 20:19:55 +0000 |
commit | 666ad445681516ae754ca623d98ee6936c04b3ff (patch) | |
tree | 73131809cab459782956ffac4ad67a4533636a2d /main.c | |
parent | dddd1be5ec6d46af84e84396f916334540773a03 (diff) | |
download | gunmake-666ad445681516ae754ca623d98ee6936c04b3ff.tar.gz |
Actually commit main.c with changes announced in last commit.
Diffstat (limited to 'main.c')
-rw-r--r-- | main.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1794,7 +1794,6 @@ main (int argc, char **argv, char **envp) if (job_slots > 1) { char *cp; - char c = '+'; #ifdef WINDOWS32 /* sub_proc.c cannot wait for more than MAXIMUM_WAIT_OBJECTS objects @@ -1814,6 +1813,8 @@ main (int argc, char **argv, char **envp) err, map_windows32_error_to_string(err)); } #else + char c = '+'; + if (pipe (job_fds) < 0 || (job_rfd = dup (job_fds[0])) < 0) pfatal_with_name (_("creating jobs pipe")); #endif @@ -3153,8 +3154,6 @@ print_data_base () static void clean_jobserver (int status) { - char token = '+'; - /* Sanity: have we written all our jobserver tokens back? If our exit status is 2 that means some kind of syntax error; we might not have written all our tokens so do that now. If tokens are left @@ -3163,6 +3162,8 @@ clean_jobserver (int status) #ifdef WINDOWS32 if (has_jobserver_semaphore() && jobserver_tokens) #else + char token = '+'; + if (job_fds[0] != -1 && jobserver_tokens) #endif { |