Skip to content

Commit

Permalink
Merge pull request #4302 from CyberShadow/pull-20160510-183209
Browse files Browse the repository at this point in the history
std.process: Disambiguate fork calls
  • Loading branch information
9il committed May 10, 2016
2 parents 478d08d + def01a9 commit 411ff8e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions std/process.d
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ private Pid spawnProcessImpl(in char[][] args,
auto stdoutFD = getFD(stdout);
auto stderrFD = getFD(stderr);

auto id = fork();
auto id = core.sys.posix.unistd.fork();
if (id < 0)
throw ProcessException.newFromErrno("Failed to spawn new process");
if (id == 0)
Expand Down Expand Up @@ -3365,7 +3365,7 @@ deprecated("Please use spawnProcess instead")
int _spawnvp(int mode, in char *pathname, in char **argv)
{
int retval = 0;
pid_t pid = fork();
pid_t pid = core.sys.posix.unistd.fork();

if (!pid)
{ // child
Expand Down Expand Up @@ -3804,7 +3804,7 @@ else version (Posix)
args[1] = url.tempCString();
args[2] = null;

auto childpid = fork();
auto childpid = core.sys.posix.unistd.fork();
if (childpid == 0)
{
core.sys.posix.unistd.execvp(args[0], cast(char**)args.ptr);
Expand Down

0 comments on commit 411ff8e

Please sign in to comment.