diff options
author | Demetri Obenour <demetriobenour@gmail.com> | 2014-05-31 16:57:48 -0400 |
---|---|---|
committer | Demetri Obenour <demetriobenour@gmail.com> | 2014-05-31 16:57:48 -0400 |
commit | cd9881c895d3826a65835a8d145140b063993d24 (patch) | |
tree | daabdd5490a173332f170cba40a6f87c3025864c /src/subprocess.h | |
parent | 6143187ac6f44995b9cd82d17cd4f13147286fb9 (diff) | |
parent | 2cfffd60c41c166d34907154b2935d60ffb2a62b (diff) | |
download | ninja-cd9881c895d3826a65835a8d145140b063993d24.tar.gz |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/subprocess.h')
-rw-r--r-- | src/subprocess.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/subprocess.h b/src/subprocess.h index 6ea6f62..b7a1a4c 100644 --- a/src/subprocess.h +++ b/src/subprocess.h @@ -44,14 +44,13 @@ struct Subprocess { const string& GetOutput() const; private: + Subprocess(bool use_console); bool Start(struct SubprocessSet* set, const string& command); void OnPipeReady(); string buf_; #ifdef _WIN32 - Subprocess(); - /// Set up pipe_ as the parent-side pipe of the subprocess; return the /// other end of the pipe, usable in the child process. HANDLE SetupPipe(HANDLE ioport); @@ -62,8 +61,6 @@ struct Subprocess { char overlapped_buf_[4 << 10]; bool is_reading_; #else - Subprocess(bool use_console); - int fd_; pid_t pid_; #endif |