iscsi: use <sys/filio.h> on Solaris.

Needed for FIONREAD.

diff --git a/ccan/iscsi/socket.c b/ccan/iscsi/socket.c
index 17c6ffee3b0370af99997fd127459b0fc8a51796..f79b31692b764dffb3e5136e1a1fb504a15c3c30 100644 (file)
--- 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/>.
 */
 
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 

+#include "config.h"

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


@@ -31,6 +32,9 @@
 #include "iscsi.h"
 #include "iscsi-private.h"
 #include "dlinklist.h"
 #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)
 {
 
 static void set_nonblocking(int fd)
 {

diff --git a/config.h b/config.h
index 09b45824603dff28faef4364110ae0c5f3c8f1e0..34aed3c9f163f815fc45c33c8e5a4ce82c154531 100644 (file)
--- 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_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
 #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 812b1b0316ff22632f71d9fde074e19183cfdf8b..63fa46fa9a3e3240d6b271099aff1cdd429ce535 100644 (file)
--- 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; });" },
          "}\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,
        { "HAVE_TYPEOF", INSIDE_MAIN, NULL,
          "__typeof__(argc) i; i = argc; return i == argc ? 0 : 1;" },
        { "HAVE_UTIME", DEFINES_FUNC, NULL,