projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merged r1970 lp:~vorlon/apt/lp.968828
[apt.git]
/
apt-inst
/
contrib
/
extracttar.h
diff --git
a/apt-inst/contrib/extracttar.h
b/apt-inst/contrib/extracttar.h
index 42f8ef5346f7057c5b406b850cc5f60796ed04dc..4b29df3141ae71dfbd54c08fae1b5f381f17a899 100644
(file)
--- a/
apt-inst/contrib/extracttar.h
+++ b/
apt-inst/contrib/extracttar.h
@@
-15,11
+15,16
@@
#define PKGLIB_EXTRACTTAR_H
#include <apt-pkg/fileutl.h>
#define PKGLIB_EXTRACTTAR_H
#include <apt-pkg/fileutl.h>
-#include <apt-pkg/dirstream.h>
-#include <
algorithm
>
+#include <
string
>
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/dirstream.h>
+#include <algorithm>
using std::min;
using std::min;
+#endif
+
+class pkgDirStream;
class ExtractTar
{
class ExtractTar
{
@@
-38,7
+43,7
@@
class ExtractTar
int GZPid;
FileFd InFd;
bool Eof;
int GZPid;
FileFd InFd;
bool Eof;
- string DecompressProg;
+ st
d::st
ring DecompressProg;
// Fork and reap gzip
bool StartGzip();
// Fork and reap gzip
bool StartGzip();
@@
-48,7
+53,7
@@
class ExtractTar
bool Go(pkgDirStream &Stream);
bool Go(pkgDirStream &Stream);
- ExtractTar(FileFd &Fd,unsigned long Max,string DecompressionProgram);
+ ExtractTar(FileFd &Fd,unsigned long Max,st
d::st
ring DecompressionProgram);
virtual ~ExtractTar();
};
virtual ~ExtractTar();
};