From c4f43d26dc6bca9f41ac73e088ba016d0a4861d2 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 27 Mar 2012 14:24:00 +1030
Subject: [PATCH 1/1] iscsi: use <sys/filio.h> on Solaris.

Needed for FIONREAD.
---
 ccan/iscsi/socket.c               | 4 ++++
 config.h                          | 1 +
 tools/configurator/configurator.c | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/ccan/iscsi/socket.c b/ccan/iscsi/socket.c
index 17c6ffee..f79b3169 100644
--- a/ccan/iscsi/socket.c
+++ b/ccan/iscsi/socket.c
@@ -15,6 +15,7 @@
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -31,6 +32,9 @@
 #include "iscsi.h"
 #include "iscsi-private.h"
 #include "dlinklist.h"
+#if HAVE_SYS_FILIO_H
+#include <sys/filio.h>
+#endif
 
 static void set_nonblocking(int fd)
 {
diff --git a/config.h b/config.h
index 09b45824..34aed3c9 100644
--- a/config.h
+++ b/config.h
@@ -46,6 +46,7 @@
 #define HAVE_SECTION_START_STOP 1
 #define HAVE_STACK_GROWS_UPWARDS 0
 #define HAVE_STATEMENT_EXPR 1
+#define HAVE_SYS_FILIO_H 0
 #define HAVE_TYPEOF 1
 #define HAVE_UTIME 1
 #define HAVE_WARN_UNUSED_RESULT 1
diff --git a/tools/configurator/configurator.c b/tools/configurator/configurator.c
index 812b1b03..63fa46fa 100644
--- a/tools/configurator/configurator.c
+++ b/tools/configurator/configurator.c
@@ -200,6 +200,8 @@ static struct test tests[] = {
 	  "}\n" },
 	{ "HAVE_STATEMENT_EXPR", INSIDE_MAIN, NULL,
 	  "return ({ int x = argc; x == argc ? 0 : 1; });" },
+	{ "HAVE_SYS_FILIO_H", OUTSIDE_MAIN, NULL, /* Solaris needs this for FIONREAD */
+	  "#include <sys/filio.h>\n" },
 	{ "HAVE_TYPEOF", INSIDE_MAIN, NULL,
 	  "__typeof__(argc) i; i = argc; return i == argc ? 0 : 1;" },
 	{ "HAVE_UTIME", DEFINES_FUNC, NULL,
-- 
2.39.2