X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/47a97b733b5462a27975fb44102e948bb10d8538..592d06b6f3c2ef2ae47c38005ae3c4e96a0841f2:/apt-inst/contrib/extracttar.h?ds=sidebyside diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h index 6daf00a27..4b29df314 100644 --- a/apt-inst/contrib/extracttar.h +++ b/apt-inst/contrib/extracttar.h @@ -14,16 +14,17 @@ #ifndef PKGLIB_EXTRACTTAR_H #define PKGLIB_EXTRACTTAR_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/extracttar.h" -#endif - #include -#include -#include +#include +#ifndef APT_8_CLEANER_HEADERS +#include +#include using std::min; +#endif + +class pkgDirStream; class ExtractTar { @@ -42,7 +43,7 @@ class ExtractTar int GZPid; FileFd InFd; bool Eof; - string DecompressProg; + std::string DecompressProg; // Fork and reap gzip bool StartGzip(); @@ -52,7 +53,7 @@ class ExtractTar bool Go(pkgDirStream &Stream); - ExtractTar(FileFd &Fd,unsigned long Max,string DecompressionProgram); + ExtractTar(FileFd &Fd,unsigned long Max,std::string DecompressionProgram); virtual ~ExtractTar(); };