From 2b1be54b96a6f140291d9b84e0d55a68aa43f34e Mon Sep 17 00:00:00 2001
From: Brad Spencer <spencer@infointeractive.com>
Date: Thu, 25 Sep 2003 20:30:20 +0000
Subject: re PR c++/6072 (3.2 g++ testsuite breakage on cygwin)

2003-09-25  Brad Spencer  <spencer@infointeractive.com>

	PR libstdc++/6072
	* acinclude.m4:
	* aclocal.m4: Regenerate.
	* config.h.in: Regenerate.
	* configure: Regenerate.
	* crossconfig.m4: Add in wchar_t bits for solaris crosses.
	* config/io/basic_file_stdio.cc: Guard unistd.h.
	* include/c_compatibility/wchar.h: Guard extra wchar_t functionality.
	* include/c_std/std_cwchar.h: Same.
	* include/c_std/std_cwctype.h: Same.

From-SVN: r71795
---
 libstdc++-v3/config/io/basic_file_stdio.cc | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'libstdc++-v3/config/io')

diff --git a/libstdc++-v3/config/io/basic_file_stdio.cc b/libstdc++-v3/config/io/basic_file_stdio.cc
index 556bd9063fb..b531906a3f8 100644
--- a/libstdc++-v3/config/io/basic_file_stdio.cc
+++ b/libstdc++-v3/config/io/basic_file_stdio.cc
@@ -33,11 +33,20 @@
 
 #include <bits/basic_file.h>
 #include <fcntl.h>
-#include <unistd.h>
 #include <errno.h>
 
+#ifdef _GLIBCXX_HAVE_POLL
+#include <poll.h>
+#endif
+
+// Pick up ioctl on Solaris 2.8
+#ifdef _GLIBCXX_HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+// Pick up FIONREAD on Solaris 2
 #ifdef _GLIBCXX_HAVE_SYS_IOCTL_H
-#define BSD_COMP /* Get FIONREAD on Solaris2. */
+#define BSD_COMP 
 #include <sys/ioctl.h>
 #endif
 
@@ -46,10 +55,6 @@
 #include <sys/filio.h>
 #endif
 
-#ifdef _GLIBCXX_HAVE_POLL
-#include <poll.h>
-#endif
-
 #ifdef _GLIBCXX_HAVE_SYS_UIO_H
 #include <sys/uio.h>
 #endif
-- 
cgit v1.2.1