projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'donkult/debian/sid' into debian/sid
[apt.git]
/
apt-inst
/
extract.h
diff --git
a/apt-inst/extract.h
b/apt-inst/extract.h
index 713e394339064dcb89c1e8808e8fbabc12a59150..7143fa40933aa235614c8e900c6617f606acddf7 100644
(file)
--- a/
apt-inst/extract.h
+++ b/
apt-inst/extract.h
@@
-17,8
+17,7
@@
#ifndef PKGLIB_EXTRACT_H
#define PKGLIB_EXTRACT_H
#ifndef PKGLIB_EXTRACT_H
#define PKGLIB_EXTRACT_H
-#ifdef __GNUG__
-#endif
+
#include <apt-pkg/dirstream.h>
#include <apt-pkg/filelist.h>
#include <apt-pkg/dirstream.h>
#include <apt-pkg/filelist.h>
@@
-34,7
+33,7
@@
class pkgExtract : public pkgDirStream
bool HandleOverwrites(pkgFLCache::NodeIterator Nde,
bool DiverCheck = false);
bool HandleOverwrites(pkgFLCache::NodeIterator Nde,
bool DiverCheck = false);
- bool CheckDirReplace(string Dir,unsigned int Depth = 0);
+ bool CheckDirReplace(st
d::st
ring Dir,unsigned int Depth = 0);
public:
public: