merged from lp:~donkult/apt/experimental

[apt.git] / apt-pkg / contrib / sha1.h

diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h
index 2701fc67e3084fb5e5c637d27e64ca512b576cb2..a8d55eb13d5a77e5f2e5fd0313ae48be29bab47d 100644 (file)
--- a/apt-pkg/contrib/sha1.h
+++ b/apt-pkg/contrib/sha1.h
@@ -18,10 +18,12 @@
 #include <cstring>
 #include <algorithm>
 
+#include "hashsum_template.h"
+
+#ifndef APT_8_CLEANER_HEADERS
 using std::string;
 using std::min;
-
-#include "hashsum_template.h"
+#endif
 
 typedef  HashSumValue<160> SHA1SumValue;
 
@@ -34,7 +36,7 @@ class SHA1Summation : public SummationImplementation
    bool Done;
    
    public:
-   bool Add(const unsigned char *inbuf, unsigned long inlen);
+   bool Add(const unsigned char *inbuf, unsigned long long inlen);
    using SummationImplementation::Add;
 
    SHA1SumValue Result();