2001-12-07 Martin M. Hunt <hunt@redhat.com>

	* configure.in: Check for sys/filio.h
	* configure: Rebuild.
	* config.in: Add HAVE_SYS_FILIO_H
	* ser-tcp.c: Conditionally include sys/filio.h.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 52cdf82..9acd44a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-07  Martin M. Hunt  <hunt@redhat.com>
+
+       * configure.in: Check for sys/filio.h
+       * configure: Rebuild.
+       * config.in: Add HAVE_SYS_FILIO_H
+       * ser-tcp.c: Conditionally include sys/filio.h.
+       
 2001-12-07  Andrew Cagney  <ac131313@redhat.com>
 
        * ui-out.c (ui_out_table_begin): Initialize body_flag.

diff --git a/gdb/config.in b/gdb/config.in
index d2d03d5..c80d8a8 100644 (file)
--- a/gdb/config.in
+++ b/gdb/config.in
@@ -343,6 +343,9 @@
 /* Define if you have the <sys/ioctl.h> header file.  */
 #undef HAVE_SYS_IOCTL_H
 
+/* Define if you have the <sys/filio.h> header file.  */
+#undef HAVE_SYS_FILIO_H
+
 /* Define if you have the <sys/ndir.h> header file.  */
 #undef HAVE_SYS_NDIR_H
 

diff --git a/gdb/configure b/gdb/configure
index dd5ea43..dcb5ce2 100755 (executable)
--- a/gdb/configure
+++ b/gdb/configure
@@ -3407,7 +3407,7 @@ for ac_hdr in ctype.h endian.h nlist.h link.h thread_db.h proc_service.h \
        term.h termio.h termios.h unistd.h wait.h sys/wait.h \
        wchar.h wctype.h asm/debugreg.h sys/debugreg.h sys/select.h \
        time.h sys/file.h sys/ioctl.h sys/user.h sys/fault.h sys/syscall.h \
-       dirent.h sys/ndir.h sys/dir.h ndir.h \
+       dirent.h sys/ndir.h sys/dir.h ndir.h sys/filio.h \
        curses.h ncurses.h \
        poll.h sys/poll.h
 do

diff --git a/gdb/configure.in b/gdb/configure.in
index b3ac702..8df5c87 100644 (file)
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -124,7 +124,7 @@ AC_CHECK_HEADERS(ctype.h endian.h nlist.h link.h thread_db.h proc_service.h \
        term.h termio.h termios.h unistd.h wait.h sys/wait.h \
        wchar.h wctype.h asm/debugreg.h sys/debugreg.h sys/select.h \
        time.h sys/file.h sys/ioctl.h sys/user.h sys/fault.h sys/syscall.h \
-       dirent.h sys/ndir.h sys/dir.h ndir.h \
+       dirent.h sys/ndir.h sys/dir.h ndir.h sys/filio.h \
        curses.h ncurses.h \
        poll.h sys/poll.h)
 AC_HEADER_STAT

diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c
index 0e96f03..6a65177 100644 (file)
--- a/gdb/ser-tcp.c
+++ b/gdb/ser-tcp.c
@@ -24,7 +24,14 @@
 #include "ser-unix.h"
 
 #include <sys/types.h>
-#include <sys/ioctl.h>
+
+#ifdef HAVE_SYS_FILIO_H
+#include <sys/filio.h>  /* For FIONBIO. */
+#endif
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>  /* For FIONBIO. */
+#endif
+
 #include <sys/time.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>