diff options
| author | Michael Vogt <mvo@debian.org> | 2013-11-23 09:13:30 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-11-23 09:13:30 +0100 |
| commit | 7d2428e03c1fdae79488b9ecd53cc5257b2a0c13 (patch) | |
| tree | 81209b60212c997452fd74cf184b8ca5445e8bc0 /apt-pkg/contrib/fileutl.h | |
| parent | f62f17b489405432a3125e51471d8a00e78c5170 (diff) | |
| parent | 61f954bff040809e7ab57b3adec2fe95339ffb94 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'apt-pkg/contrib/fileutl.h')
| -rw-r--r-- | apt-pkg/contrib/fileutl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index decd64d9d..63a999c30 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -26,6 +26,7 @@ #include <string> #include <vector> +#include <set> #include <zlib.h> @@ -182,6 +183,7 @@ void SetCloseExec(int Fd,bool Close); void SetNonBlock(int Fd,bool Block); bool WaitFd(int Fd,bool write = false,unsigned long timeout = 0); pid_t ExecFork(); +pid_t ExecFork(std::set<int> keep_fds); bool ExecWait(pid_t Pid,const char *Name,bool Reap = false); // File string manipulators |