Updated to include <sys/select.h> as needed.

Removed IRIX select() prototype - not needed for IRIX 5.3 or higher.


git-svn-id: file:///fltk/svn/fltk/trunk@254 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

3 files changed, 18 insertions, 11 deletions

diff --git a/configh.in b/configh.in
index 2e04d8321..791d37742 100644
--- a/configh.in
+++ b/configh.in
@@ -1,5 +1,5 @@
 /*
- * "$Id: configh.in,v 1.9 1999/01/07 19:16:47 mike Exp $"
+ * "$Id: configh.in,v 1.10 1999/01/27 17:52:22 mike Exp $"
  *
  * Configuration file for the Fast Light Tool Kit (FLTK).
  * @configure_input@
@@ -135,6 +135,14 @@
 #define HAVE_VSPRINTF 0
 
 /*
+ * HAVE_SYS_SELECT_H:
+ *
+ * Whether or not select() call has its own header file.
+ */
+
+#define HAVE_SYS_SELECT 0
+
+/*
  * HAVE_POLL:
  *
  * Use poll() if we don't have select().
@@ -151,5 +159,5 @@
 #define HAVE_LIBJPEG 0
 
 /*
- * End of "$Id: configh.in,v 1.9 1999/01/07 19:16:47 mike Exp $".
+ * End of "$Id: configh.in,v 1.10 1999/01/27 17:52:22 mike Exp $".
  */
diff --git a/configure.in b/configure.in
index 54eca6b74..2be4849ab 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl# -*- sh -*-
 dnl# the "configure" script is made from this by running GNU "autoconf"
 dnl#
-dnl# "$Id: configure.in,v 1.17 1999/01/07 19:16:49 mike Exp $"
+dnl# "$Id: configure.in,v 1.18 1999/01/27 17:52:23 mike Exp $"
 dnl#
 dnl# Configuration script for the Fast Light Tool Kit (FLTK).
 dnl#
@@ -101,7 +101,7 @@ fi
 fi
 
 AC_HEADER_DIRENT
-
+AC_CHECK_HEADER(sys/select.h)
 AC_CHECK_FUNCS(scandir)
 AC_CHECK_FUNCS(vsnprintf)
 AC_CHECK_FUNCS(snprintf)
@@ -166,5 +166,5 @@ AC_CONFIG_HEADER(config.h:configh.in)
 AC_OUTPUT(makeinclude)
 
 dnl#
-dnl# End of "$Id: configure.in,v 1.17 1999/01/07 19:16:49 mike Exp $".
+dnl# End of "$Id: configure.in,v 1.18 1999/01/27 17:52:23 mike Exp $".
 dnl#
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index c9e34e5ab..412437c6f 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_x.cxx,v 1.21 1999/01/13 15:45:50 mike Exp $"
+// "$Id: Fl_x.cxx,v 1.22 1999/01/27 17:52:25 mike Exp $"
 //
 // X specific code for the Fast Light Tool Kit (FLTK).
 //
@@ -39,6 +39,9 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/time.h>
+#if HAVE_SYS_SELECT_H
+#  include <sys/select.h>
+#endif /* HAVE_SYS_SELECT_H */
 
 ////////////////////////////////////////////////////////////////
 // interface to poll/select call:
@@ -51,10 +54,6 @@ struct pollfd {int fd; short events; short revents;};
 #define POLLOUT 4
 #define POLLERR 8
 
-#ifdef __sgi // fix bugs in Irix's select header:
-extern "C" int	select( int, fd_set *, fd_set *, fd_set *, struct timeval * );
-#endif
-
 //
 // The following #define is only needed for HP-UX 9.x and earlier.  10.x
 // and beyond have the right stuff, and any good GCC distribution fixes
@@ -819,5 +818,5 @@ void Fl_Window::make_current() {
 #endif
 
 //
-// End of "$Id: Fl_x.cxx,v 1.21 1999/01/13 15:45:50 mike Exp $".
+// End of "$Id: Fl_x.cxx,v 1.22 1999/01/27 17:52:25 mike Exp $".
 //