Merge remote-tracking branch 'upstream/debian/sid' into debian/experimental

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

diff --git a/apt-pkg/contrib/sha1.h b/apt-pkg/contrib/sha1.h
index 2701fc67e3084fb5e5c637d27e64ca512b576cb2..5770c315ab1a76a4205e5658adb567cdf34974cf 100644 (file)
--- a/apt-pkg/contrib/sha1.h
+++ b/apt-pkg/contrib/sha1.h
@@ -14,14 +14,17 @@
 #ifndef APTPKG_SHA1_H
 #define APTPKG_SHA1_H
 
 #ifndef APTPKG_SHA1_H
 #define APTPKG_SHA1_H
 

+#include "hashsum_template.h"
+
+#ifndef APT_10_CLEANER_HEADERS

 #include <string>
 #include <cstring>
 #include <algorithm>
 #include <string>
 #include <cstring>
 #include <algorithm>

-
+#endif
+#ifndef APT_8_CLEANER_HEADERS

 using std::string;
 using std::min;
 using std::string;
 using std::min;

-
-#include "hashsum_template.h"
+#endif

 
 typedef  HashSumValue<160> SHA1SumValue;
 
 
 typedef  HashSumValue<160> SHA1SumValue;
 


@@ -34,7 +37,7 @@ class SHA1Summation : public SummationImplementation
    bool Done;
    
    public:
    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();
    using SummationImplementation::Add;
 
    SHA1SumValue Result();