From 8d1277b777045f45ffae210edea608c27587d7a2 Mon Sep 17 00:00:00 2001
From: CoolStar <coolstarorganization@gmail.com>
Date: Thu, 20 Dec 2018 15:11:31 -0800
Subject: APT 1.7.0-sileo

---
 apt-pkg/contrib/fileutl.cc  | 8 ++++----
 apt-pkg/contrib/progress.cc | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'apt-pkg/contrib')

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index f7c8107b4..2ef1075a1 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -186,8 +186,8 @@ static char *searchpath(const char *binaryname){
             strcpy(foundpath, binaryname);
             return foundpath;
         } else {
-	    return NULL;
-	}
+       return NULL;
+   }
     }
     
     char *pathvar = getenv("PATH");
@@ -274,7 +274,7 @@ static char *fixedCmd(const char *cmdStr){
                 strcat(rawCommand, " ");
                 strcat(rawCommand, args);
             }
-	    rawCommand[(commandSize)+1] = '\0';
+       rawCommand[(commandSize)+1] = '\0';
             
             free(interpreter);
             free(abs_path);
@@ -295,7 +295,7 @@ static char *fixedCmd(const char *cmdStr){
                 strcat(rawCommand, " ");
                 strcat(rawCommand, args);
             }
-	    rawCommand[(commandSize)+1] = '\0';
+       rawCommand[(commandSize)+1] = '\0';
             
             free(abs_path);
             free(cmdCpy);
diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index 806bd47f8..cab3ebce7 100644
--- a/apt-pkg/contrib/progress.cc
+++ b/apt-pkg/contrib/progress.cc
@@ -119,7 +119,7 @@ bool OpProgress::CheckChange(float Interval)
    auto const Now = std::chrono::steady_clock::now().time_since_epoch();
    auto const Now_sec = std::chrono::duration_cast<std::chrono::seconds>(Now);
    auto const Now_usec = std::chrono::duration_cast<std::chrono::microseconds>(Now - Now_sec);
-   struct timeval NowTime = { Now_sec.count(), Now_usec.count() };
+   struct timeval NowTime = { Now_sec.count(), static_cast<__darwin_suseconds_t>(Now_usec.count()) };
 
    std::chrono::duration<decltype(Interval)> Delta =
       std::chrono::seconds(NowTime.tv_sec - LastTime.tv_sec) +
-- 
cgit v1.2.3