From 61ec27797e00a89dcde22877360686513d7e7a56 Mon Sep 17 00:00:00 2001
From: Michael Vogt <egon@tas>
Date: Thu, 7 Dec 2006 11:28:00 +0100
Subject: * apt-pkg/contrib/progress.cc   - only check time on precent
 boundaries (seems to make a real difference     on ARM, see debian #398381) *
 apt-pkg/contrib/sha256.cc:   - added #pragma interface *
 apt-pkg/contrib/sha256.h:   - remove unneeded stdint.h include *
 apt-pkg/vendorlist.cc:   - fix qualifier to make it build with -O0 * po/:   -
 make update-po

---
 apt-pkg/contrib/progress.cc | 3 ++-
 apt-pkg/contrib/sha256.cc   | 6 ++++++
 apt-pkg/contrib/sha256.h    | 1 -
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'apt-pkg/contrib')

diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index cb272e389..e3db9a45a 100644
--- a/apt-pkg/contrib/progress.cc
+++ b/apt-pkg/contrib/progress.cc
@@ -115,6 +115,8 @@ bool OpProgress::CheckChange(float Interval)
    
    if ((int)LastPercent == (int)Percent)
       return false;
+
+   LastPercent = Percent;
    
    if (Interval == 0)
       return false;
@@ -126,7 +128,6 @@ bool OpProgress::CheckChange(float Interval)
    if (Diff < Interval)
       return false;
    LastTime = Now;   
-   LastPercent = Percent;
    return true;
 }
 									/*}}}*/
diff --git a/apt-pkg/contrib/sha256.cc b/apt-pkg/contrib/sha256.cc
index b75ce8a84..ecda3d8e8 100644
--- a/apt-pkg/contrib/sha256.cc
+++ b/apt-pkg/contrib/sha256.cc
@@ -18,6 +18,12 @@
  * any later version.
  *
  */
+
+#ifdef __GNUG__
+#pragma implementation "apt-pkg/sha256.h"
+#endif
+
+
 #define SHA256_DIGEST_SIZE      32
 #define SHA256_HMAC_BLOCK_SIZE  64
 
diff --git a/apt-pkg/contrib/sha256.h b/apt-pkg/contrib/sha256.h
index 9e88f5ece..70b3ae2ad 100644
--- a/apt-pkg/contrib/sha256.h
+++ b/apt-pkg/contrib/sha256.h
@@ -20,7 +20,6 @@
 
 #include <string>
 #include <algorithm>
-#include <stdint.h>
 
 using std::string;
 using std::min;
-- 
cgit v1.2.3