merged debian/sid

[apt.git] / methods / rred.cc

diff --git a/methods/rred.cc b/methods/rred.cc
index 38554464d3089a5e2ebee1e888092bf7ff5bae99..7c65f8f9223a30d15d552d27d7dfb4ebdc90a852 100644 (file)
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -15,7 +15,6 @@
 #include <utime.h>
 #include <stdio.h>
 #include <errno.h>
-#include <zlib.h>
 #include <apti18n.h>
                                                                                /*}}}*/
 /** \brief RredMethod - ed-style incremential patch method                     {{{
@@ -227,7 +226,7 @@ struct EdCommand {
   char type;
 };
 #define IOV_COUNT 1024 /* Don't really want IOV_MAX since it can be arbitrarily large */
-ssize_t retry_writev(int fd, const struct iovec *iov, int iovcnt) {
+static ssize_t retry_writev(int fd, const struct iovec *iov, int iovcnt) {
        ssize_t Res;
        errno = 0;
        ssize_t i = 0;