diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-09-13 17:52:22 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-09-13 17:52:22 +0200 |
| commit | 74b220028595342028e3309002e4ec359af328f9 (patch) | |
| tree | 0132b7fd4b4f5fa5e2dbce1f2e0fbeeff2c8e101 /methods/rred.cc | |
| parent | 650faab01603caac04494d54cf6b10a65c00ea13 (diff) | |
| parent | b11fe392b2245354591296df88c3be2e6218af12 (diff) | |
| download | apt-74b220028595342028e3309002e4ec359af328f9.tar.gz | |
merge with debian/experimental
Diffstat (limited to 'methods/rred.cc')
| -rw-r--r-- | methods/rred.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/methods/rred.cc b/methods/rred.cc index 57d9a843..bc941ed0 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -53,7 +53,7 @@ protected: virtual bool Fetch(FetchItem *Itm); public: - RredMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {}; + RredMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig), Debug(false) {}; }; /*}}}*/ /** \brief applyFile - in reverse order with a tail recursion {{{ @@ -241,7 +241,9 @@ RredMethod::State RredMethod::patchFile(FileFd &Patch, FileFd &From, /*{{{*/ return result; } /*}}}*/ -struct EdCommand { /*{{{*/ +/* struct EdCommand {{{*/ +#ifdef _POSIX_MAPPED_FILES +struct EdCommand { size_t data_start; size_t data_end; size_t data_lines; @@ -250,6 +252,7 @@ struct EdCommand { /*{{{*/ char type; }; #define IOV_COUNT 1024 /* Don't really want IOV_MAX since it can be arbitrarily large */ +#endif /*}}}*/ RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From, /*{{{*/ FileFd &out_file, Hashes *hash) const { |