Make <sys/select.h> really self-contained, also on Solaris 10.

diff --git a/ChangeLog b/ChangeLog
index b5bac665f1315245d8f350fe028fadc54e3a89d2..339ce0101e5fab7d3984443b3f489640a40bf15a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-08-09  Bruno Haible  <bruno@clisp.org>
+
+       Make <sys/select.h> really self-contained, also on Solaris 10.
+       * lib/sys_select.in.h: Include <string.h>.
+       * m4/sys_select_h.m4 (gl_HEADER_SYS_SELECT): Test also against
+       Solaris 10 problem.
+       * tests/test-sys_select.c (main): Add check that FD_ZERO can be used.
+       * doc/posix-headers/sys_select.texi: Mention the Solaris 10 problem.
+       Reported by Jim Meyering.
+
 2009-08-09  Bruno Haible  <bruno@clisp.org>
 
        Avoid warnings from 'aclocal' that are due to a use of macro name

diff --git a/doc/posix-headers/sys_select.texi b/doc/posix-headers/sys_select.texi
index 1a30318c5323b332d81d6f6e353b288ffc063593..903606576ff12020ed15f5c59dd611f6d338ad46 100644 (file)
--- a/doc/posix-headers/sys_select.texi
+++ b/doc/posix-headers/sys_select.texi
@@ -16,6 +16,10 @@ This header file is not self-contained on some platforms: it requires
 @item
 This header file does not define @code{struct timeval} on some platforms:
 OSF/1 4.0.
+@item
+This header file is not self-contained --- it requires @code{<string.h>}
+before @code{FD_ZERO} can be used --- on some platforms:
+Solaris 10.
 @end itemize
 
 Portability problems not fixed by Gnulib:

diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h
index 62cd1048bec350f987b69c01c1a2d9444ba94b32..1fb2d946f683c612de724af1767e2ccf52546420 100644 (file)
--- a/lib/sys_select.in.h
+++ b/lib/sys_select.in.h
@@ -42,9 +42,13 @@
 # include <sys/types.h>
 
 /* On OSF/1 4.0, <sys/select.h> provides only a forward declaration
-   of 'struct timeval', and no definition of this type..  */
+   of 'struct timeval', and no definition of this type.  */
 # include <sys/time.h>
 
+/* On Solaris 10, <sys/select.h> provides an FD_ZERO implementation
+   that relies on memset(), but without including <string.h>.  */
+# include <string.h>
+
 /* The include_next requires a split double-inclusion guard.  */
 # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@
 

diff --git a/m4/sys_select_h.m4 b/m4/sys_select_h.m4
index c48be2ce383ab443fec974a2e8e04d6d4340a80d..0bb097e1a7395af4f103fe94ce7b5de947705076 100644 (file)
--- a/m4/sys_select_h.m4
+++ b/m4/sys_select_h.m4
@@ -1,4 +1,4 @@
-# sys_select_h.m4 serial 7
+# sys_select_h.m4 serial 8
 dnl Copyright (C) 2006-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -11,10 +11,39 @@ AC_DEFUN([gl_HEADER_SYS_SELECT],
   AC_CACHE_CHECK([whether <sys/select.h> is self-contained],
     [gl_cv_header_sys_select_h_selfcontained],
     [
+      dnl Test against two bugs:
+      dnl 1. On many platforms, <sys/select.h> assumes prior inclusion of
+      dnl    <sys/types.h>.
+      dnl 2. On OSF/1 4.0, <sys/select.h> provides only a forward declaration
+      dnl    of 'struct timeval', and no definition of this type.
       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/select.h>]],
                                         [[struct timeval b;]])],
         [gl_cv_header_sys_select_h_selfcontained=yes],
         [gl_cv_header_sys_select_h_selfcontained=no])
+      dnl Test against another bug:
+      dnl 3. On Solaris 10, <sys/select.h> provides an FD_ZERO implementation
+      dnl    that relies on memset(), but without including <string.h>.
+      if test $gl_cv_header_sys_select_h_selfcontained = yes; then
+        AC_COMPILE_IFELSE(
+          [AC_LANG_PROGRAM([[#include <sys/select.h>]],
+                           [[int memset; int bzero;]])
+          ],
+          [AC_LINK_IFELSE(
+             [AC_LANG_PROGRAM([[#include <sys/select.h>]], [[
+                  #undef memset
+                  #define memset nonexistent_memset
+                  extern void *memset (void *, int, unsigned long);
+                  #undef bzero
+                  #define bzero nonexistent_bzero
+                  extern void bzero (void *, unsigned long);
+                  fd_set fds;
+                  FD_ZERO (&fds);
+                ]])
+             ],
+             [],
+             [gl_cv_header_sys_select_h_selfcontained=no])
+          ])
+      fi
     ])
   if test $gl_cv_header_sys_select_h_selfcontained = yes; then
     SYS_SELECT_H=''

diff --git a/tests/test-sys_select.c b/tests/test-sys_select.c
index 6449dafde76ecc9be1fbeb44e070fdeeb8d985bc..66079529ef6b6e758825ed8e378c3993ac422607 100644 (file)
--- a/tests/test-sys_select.c
+++ b/tests/test-sys_select.c
@@ -1,5 +1,5 @@
 /* Test of <sys/select.h> substitute.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,5 +26,10 @@ struct timeval t1;
 int
 main ()
 {
+  /* Check that FD_ZERO can be used.  This should not yield a warning
+     such as "warning: implicit declaration of function 'memset'".  */
+  fd_set fds;
+  FD_ZERO (&fds);
+
   return 0;
 }