Fixed long forgotten merges.
This commit is contained in:
parent
8c01ec8897
commit
e090a9368d
4 changed files with 6 additions and 13 deletions
|
@ -28,10 +28,8 @@ namespace Util {
|
|||
static pid_t Start(std::string name, std::string cmd);
|
||||
static pid_t Start(std::string name, std::string cmd, std::string cmd2);
|
||||
static pid_t Start(std::string name, std::string cmd, std::string cmd2, std::string cmd3);
|
||||
|
||||
static pid_t StartPiped(char * const * argv, int * fdin, int * fdout, int * fderr);
|
||||
static pid_t StartPiped(std::string name, char * const * argv, int * fdin, int * fdout, int * fderr);
|
||||
|
||||
static pid_t StartPiped(std::string name, std::string cmd, int * fdin, int * fdout, int * fderr);
|
||||
static pid_t StartPiped2(std::string name, std::string cmd1, std::string cmd2, int * fdin, int * fdout, int * fderr1, int * fderr2);
|
||||
static void Stop(std::string name);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue