diff options
author | Michael Vogt <egon@debian-devbox> | 2011-08-15 14:10:42 +0200 |
---|---|---|
committer | Michael Vogt <egon@debian-devbox> | 2011-08-15 14:10:42 +0200 |
commit | c5ca2c52a98fcb50de6429cf370ed5b6b7602a00 (patch) | |
tree | 03dbb2f6898ad12126c40e6f7c64c01e863ccacd /methods/rred.cc | |
parent | 97efc27f0723f09405d7a1836ab21c2e2948eb10 (diff) | |
parent | d4882aa1e1a37b3092950180036676a930a5792f (diff) |
merged from the debian-sid branch
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 849973e1a..6c55880ca 100644 --- a/methods/rred.cc +++ b/methods/rred.cc @@ -51,7 +51,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 {{{ @@ -239,7 +239,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; @@ -248,6 +250,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 { |