diff options
| author | Renato Botelho <renato@netgate.com> | 2016-04-28 11:34:22 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-04-28 11:34:22 -0300 |
| commit | d1ef4e7974b0b2817406da15fd95d9f836aa1912 (patch) | |
| tree | be0fc739c69cdd44a57a5c6abe9001c070bf335f /contrib/ntp/libntp/work_fork.c | |
| parent | 6f331e8a44f8f914e7cd1813a5e96d20c55891e5 (diff) | |
| parent | 1d5d3749a4b560c02782ced59660844e31c631a9 (diff) | |
| download | FreeBSD-src-d1ef4e7974b0b2817406da15fd95d9f836aa1912.zip FreeBSD-src-d1ef4e7974b0b2817406da15fd95d9f836aa1912.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'contrib/ntp/libntp/work_fork.c')
| -rw-r--r-- | contrib/ntp/libntp/work_fork.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/ntp/libntp/work_fork.c b/contrib/ntp/libntp/work_fork.c index 96c550e..6c9545a 100644 --- a/contrib/ntp/libntp/work_fork.c +++ b/contrib/ntp/libntp/work_fork.c @@ -451,7 +451,7 @@ fork_blocking_child( } } -#ifdef HAVE_DROPROOT +#if defined(HAVE_DROPROOT) && !defined(NEED_EARLY_FORK) /* defer the fork until after root is dropped */ if (droproot && !root_dropped) return; @@ -540,6 +540,11 @@ fork_blocking_child( } +void worker_global_lock(int inOrOut) +{ + (void)inOrOut; +} + #else /* !WORK_FORK follows */ char work_fork_nonempty_compilation_unit; #endif |
