From: Amos Jeffries Date: Mon, 9 Feb 2015 18:12:51 +0000 (-0800) Subject: Windows: fix build errors after rev.13867 X-Git-Tag: merge-candidate-3-v1~273 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c92fcbad7c442cc6ceda2cc67087c508b5003703;p=thirdparty%2Fsquid.git Windows: fix build errors after rev.13867 --- diff --git a/src/main.cc b/src/main.cc index 45e20a44f6..76ee88b4f4 100644 --- a/src/main.cc +++ b/src/main.cc @@ -1700,6 +1700,7 @@ checkRunningPid(void) return 1; } +#if !_SQUID_WINDOWS_ static void masterCheckAndBroadcastSignals() { @@ -1714,6 +1715,7 @@ masterCheckAndBroadcastSignals() BroadcastSignalIfAny(ReconfigureSignal); BroadcastSignalIfAny(ShutdownSignal); } +#endif static inline bool masterSignaled() diff --git a/src/tools.cc b/src/tools.cc index 7e5ccff63a..89341015b5 100644 --- a/src/tools.cc +++ b/src/tools.cc @@ -1226,6 +1226,8 @@ WaitForOnePid(pid_t pid, PidStatus &status, int flags) if (pid < 0) return wait3(&status, flags, NULL); return wait4(cpid, &status, flags, NULL); +#elif _SQUID_WINDOWS_ + return 0; // function not used on Windows #else return waitpid(pid, &status, flags); #endif