From d287a035e07030be13f72265d4d0812086c323f5 Mon Sep 17 00:00:00 2001
From: Sebastian Schmidt <yath@yath.de>
Date: Sat, 17 May 2014 06:57:47 +0200
Subject: fix screen width detection for apt/apt-get lists

3163087b moved SigWinch(int) from apt-get.cc to private-output.cc
without moving #include <sys/ioctl.h>, making SigWinch a nop.

Closes: 748430, 747942
---
 apt-private/private-output.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'apt-private/private-output.cc')

diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc
index 7f3eef6c2..32f27a3dd 100644
--- a/apt-private/private-output.cc
+++ b/apt-private/private-output.cc
@@ -23,6 +23,7 @@
 #include <langinfo.h>
 #include <unistd.h>
 #include <signal.h>
+#include <sys/ioctl.h>
 
 #include <apti18n.h>
 									/*}}}*/
-- 
cgit v1.2.3


From 2847bed0b704bc636f169c5766da42180a084eac Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Tue, 10 Jun 2014 15:22:53 +0200
Subject: apt-private/private-output.cc: fix cppcheck output

---
 apt-private/private-output.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'apt-private/private-output.cc')

diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc
index 32f27a3dd..8f190a551 100644
--- a/apt-private/private-output.cc
+++ b/apt-private/private-output.cc
@@ -94,7 +94,7 @@ bool InitOutput()							/*{{{*/
 static std::string GetArchiveSuite(pkgCacheFile &/*CacheFile*/, pkgCache::VerIterator ver) /*{{{*/
 {
    std::string suite = "";
-   if (ver && ver.FileList() && ver.FileList())
+   if (ver && ver.FileList())
    {
       pkgCache::VerFileIterator VF = ver.FileList();
       for (; VF.end() == false ; ++VF)
-- 
cgit v1.2.3