* merged from apt--mvo

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

diff --git a/apt-pkg/contrib/md5.h b/apt-pkg/contrib/md5.h
index 47c6a7cec12637806add1098a3c80e7770746bc5..247b3fab936c28229071f2810d46956a325b5607 100644 (file)
--- a/apt-pkg/contrib/md5.h
+++ b/apt-pkg/contrib/md5.h
@@ -23,13 +23,13 @@
 #ifndef APTPKG_MD5_H
 #define APTPKG_MD5_H
 
 #ifndef APTPKG_MD5_H
 #define APTPKG_MD5_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/md5.h"
-#endif 

 
 #include <string>
 
 #include <string>

+#include <algorithm>
+#include <stdint.h>

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

+using std::min;

 
 class MD5Summation;
 
 
 class MD5Summation;
 


@@ -56,7 +56,7 @@ class MD5SumValue
 
 class MD5Summation
 {
 
 class MD5Summation
 {

-   unsigned char Buf[4*4];
+   uint32_t Buf[4];

    unsigned char Bytes[2*4];
    unsigned char In[16*4];
    bool Done;
    unsigned char Bytes[2*4];
    unsigned char In[16*4];
    bool Done;