From 24a59c62efafbdb8387b2d3c5616b04b9fd21306 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Tue, 23 Aug 2016 13:15:15 +0200
Subject: Add missing includes and external definitions

Several modules use std::array without including the
array header. Bad modules.

Some modules use STDOUT_FILENO and friends, or close()
without including unistd.h, where they are defined.

One module also uses WIFEXITED() without including
sys/wait.h.

Finally, environ is not specified to be defined in unistd.h. We
are required to define it ourselves according to POSIX, so let's
do that.
---
 apt-private/private-show.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'apt-private')

diff --git a/apt-private/private-show.cc b/apt-private/private-show.cc
index 03229476e..27338a08c 100644
--- a/apt-private/private-show.cc
+++ b/apt-private/private-show.cc
@@ -24,6 +24,7 @@
 #include <apt-private/private-show.h>
 
 #include <stdio.h>
+#include <unistd.h>
 #include <ostream>
 #include <string>
 
-- 
cgit v1.2.3


From 2c391d850fb405e03bca362caa5c90262c66fe33 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Tue, 23 Aug 2016 14:40:46 +0200
Subject: CMake/private-download: Fix statfs includes on FreeBSD

On FreeBSD, we have to include sys/params.h and sys/mount.h,
not sys/vfs.h.

Gbp-Dch: ignore
---
 apt-private/private-download.cc | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'apt-private')

diff --git a/apt-private/private-download.cc b/apt-private/private-download.cc
index c85a49727..d0cbbcf50 100644
--- a/apt-private/private-download.cc
+++ b/apt-private/private-download.cc
@@ -25,7 +25,14 @@
 #include <sys/types.h>
 #include <pwd.h>
 #include <fcntl.h>
+#ifdef HAVE_VFS_H
 #include <sys/vfs.h>
+#else
+#ifdef HAVE_PARAMS_H
+#include <sys/params.h>
+#endif
+#include <sys/mount.h>
+#endif
 #include <sys/statvfs.h>
 #include <sys/stat.h>
 #include <errno.h>
-- 
cgit v1.2.3