From 3f9f034f896d6da8924cb1550c5a1ff23694ac3f Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 9 Jan 2013 22:32:30 +1100
Subject: [PATCH] 3456.   [port]          g++47: aft fails to compile. [RT
 #32012]

---
 CHANGES                            | 2 ++
 unit/atf-src/atf-c++/detail/ui.cpp | 2 ++
 unit/atf-src/atf-run/user.cpp      | 2 ++
 unit/atf-src/atf-sh/atf-check.cpp  | 1 +
 4 files changed, 7 insertions(+)

diff --git a/CHANGES b/CHANGES
index 8ba0f960c3..1c3e3a6b51 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3456.	[port]		g++47: aft fails to compile. [RT #32012]
+
 3455.	[contrib]	queryperf: fix getopt option list. [RT #32338]
 
 3454.	[port]		sparc64: improve atomic support. [RT #25182]
diff --git a/unit/atf-src/atf-c++/detail/ui.cpp b/unit/atf-src/atf-c++/detail/ui.cpp
index 83782ac848..8b6b797663 100644
--- a/unit/atf-src/atf-c++/detail/ui.cpp
+++ b/unit/atf-src/atf-c++/detail/ui.cpp
@@ -28,6 +28,8 @@
 //
 
 extern "C" {
+#include <unistd.h>
+
 #include <sys/ioctl.h>
 
 #include <termios.h>
diff --git a/unit/atf-src/atf-run/user.cpp b/unit/atf-src/atf-run/user.cpp
index ec54604f18..9ba82acf7a 100644
--- a/unit/atf-src/atf-run/user.cpp
+++ b/unit/atf-src/atf-run/user.cpp
@@ -28,6 +28,8 @@
 //
 
 extern "C" {
+#include <unistd.h>
+
 #include <sys/types.h>
 
 #include <pwd.h>
diff --git a/unit/atf-src/atf-sh/atf-check.cpp b/unit/atf-src/atf-sh/atf-check.cpp
index 4e4f6aad0d..862bfa28bb 100644
--- a/unit/atf-src/atf-sh/atf-check.cpp
+++ b/unit/atf-src/atf-sh/atf-check.cpp
@@ -33,6 +33,7 @@ extern "C" {
 
 #include <limits.h>
 #include <signal.h>
+#include <unistd.h>
 }
 
 #include <cerrno>