X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/dc50285d324d83548eae7e87b92d4f82b931fc30..f1bdfe81560b110dbf1ee6f5f7fa8c98423ef345:/apt-pkg/contrib/sha1.cc

diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc
index d7f606982..eae52d52f 100644
--- a/apt-pkg/contrib/sha1.cc
+++ b/apt-pkg/contrib/sha1.cc
@@ -29,18 +29,14 @@
  */
 									/*}}} */
 // Include Files                                                        /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/sha1.h"
-#endif
-
 #include <apt-pkg/sha1.h>
 #include <apt-pkg/strutl.h>
+#include <apt-pkg/macros.h>
 
 #include <string.h>
 #include <unistd.h>
 #include <inttypes.h>
 #include <config.h>
-#include <system.h>
 									/*}}}*/
 
 // SHA1Transform - Alters an existing SHA-1 hash			/*{{{*/
@@ -344,10 +340,10 @@ bool SHA1Summation::AddFD(int Fd,unsigned long Size)
    unsigned char Buf[64 * 64];
    int Res = 0;
    int ToEOF = (Size == 0);
-   while (Size != 0 || ToEOF);
+   while (Size != 0 || ToEOF)
    {
-      int n = sizeof(Buf);
-      if (!ToEOF) n = MIN(Size,n);
+      unsigned n = sizeof(Buf);
+      if (!ToEOF) n = min(Size,(unsigned long)n);
       Res = read(Fd,Buf,n);
       if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read
 	 return false;