merge with my debian-sid branch

[apt.git] / apt-pkg / contrib / crc-16.cc

diff --git a/apt-pkg/contrib/crc-16.cc b/apt-pkg/contrib/crc-16.cc
index b300ed67e48275ff9dffc81ad6de90d1b2f89956..4058821f9f9ea11be10d0ebf1cccf35a0703f17a 100644 (file)
--- a/apt-pkg/contrib/crc-16.cc
+++ b/apt-pkg/contrib/crc-16.cc
@@ -15,6 +15,8 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

 #include <apt-pkg/crc-16.h>
                                                                        /*}}}*/
 
 #include <apt-pkg/crc-16.h>
                                                                        /*}}}*/
 


@@ -63,7 +65,7 @@ static unsigned short const crc16_table[256] =
 /* Recompute the FCS with one more character appended. */
 #define CalcFCS(fcs, c) (((fcs) >> 8) ^ crc16_table[((fcs) ^ (c)) & 0xff])
 unsigned short AddCRC16(unsigned short fcs, void const *Buf,
 /* Recompute the FCS with one more character appended. */
 #define CalcFCS(fcs, c) (((fcs) >> 8) ^ crc16_table[((fcs) ^ (c)) & 0xff])
 unsigned short AddCRC16(unsigned short fcs, void const *Buf,

-                       unsigned long len) 
+                       unsigned long long len)

 {
    unsigned char const *buf = (unsigned char const *)Buf;
    while (len--)
 {
    unsigned char const *buf = (unsigned char const *)Buf;
    while (len--)