From dd915e74b187a232d067d03dfc82ac8b3750f741 Mon Sep 17 00:00:00 2001 From: Benjamin Schaaf Date: Wed, 16 Jan 2019 10:09:49 +1100 Subject: [PATCH] Fix Windows compiler errors --- source/eventcore/drivers/posix/processes.d | 11 +++++++---- source/eventcore/drivers/winapi/pipes.d | 6 +++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/source/eventcore/drivers/posix/processes.d b/source/eventcore/drivers/posix/processes.d index a6955c6..00162a8 100644 --- a/source/eventcore/drivers/posix/processes.d +++ b/source/eventcore/drivers/posix/processes.d @@ -6,9 +6,6 @@ import eventcore.drivers.posix.driver; import eventcore.drivers.posix.signals; import eventcore.internal.utils : nogc_assert, print; -import core.stdc.errno : errno, EAGAIN, EINPROGRESS; -import core.sys.posix.signal; -import core.sys.posix.unistd : close, read, write, dup; import std.algorithm.comparison : among; import std.variant : visit; @@ -17,7 +14,9 @@ private enum SIGCHLD = 17; final class SignalEventDriverProcesses(Loop : PosixEventLoop) : EventDriverProcesses { @safe: /*@nogc:*/ nothrow: + import core.stdc.errno : errno, EAGAIN, EINPROGRESS; import core.sys.linux.sys.signalfd; + import core.sys.posix.unistd : close, read, write, dup; private { static struct ProcessInfo { @@ -38,6 +37,8 @@ final class SignalEventDriverProcesses(Loop : PosixEventLoop) : EventDriverProce this(Loop loop, EventDriverPipes pipes) { + import core.sys.posix.signal; + m_loop = loop; m_pipes = pipes; @@ -182,7 +183,9 @@ final class SignalEventDriverProcesses(Loop : PosixEventLoop) : EventDriverProce final override void kill(ProcessID pid, int signal) @trusted { - .kill(cast(int)pid, signal); + import core.sys.posix.signal : pkill = kill; + + pkill(cast(int)pid, signal); } final override size_t wait(ProcessID pid, ProcessWaitCallback on_process_exit) diff --git a/source/eventcore/drivers/winapi/pipes.d b/source/eventcore/drivers/winapi/pipes.d index ecc9226..bf33841 100644 --- a/source/eventcore/drivers/winapi/pipes.d +++ b/source/eventcore/drivers/winapi/pipes.d @@ -42,17 +42,17 @@ final class WinAPIEventDriverPipes : EventDriverPipes { assert(false, "TODO!"); } - override void addRef(PipeID pid) + override void addRef(PipeFD pid) { assert(false, "TODO!"); } - override bool releaseRef(PipeID pid) + override bool releaseRef(PipeFD pid) { assert(false, "TODO!"); } - protected override void* rawUserData(PipeID descriptor, size_t size, DataInitializer initialize, DataInitializer destroy) + protected override void* rawUserData(PipeFD descriptor, size_t size, DataInitializer initialize, DataInitializer destroy) @system { assert(false, "TODO!"); }