[Emacs-diffs] trunk r117670: Merge from gnulib.

[Paul Eggert]

------------------------------------------------------------
revno: 117670
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2014-08-08 23:57:59 -0700
message:
  Merge from gnulib.
  
  This incorporates:
  2014-08-07 getdtablesize: fall back on sysconf (_SC_OPEN_MAX)
  2014-08-05 sys_select: fix FD_ZERO problem on Solaris 10
  * lib/getdtablesize.c, lib/sys_select.in.h: Update from gnulib.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  lib/getdtablesize.c            
getdtablesize.c-20130707175726-ax31vjqobh17obwz-2
  lib/sys_select.in.h            
sys_select.in.h-20120622212453-poe1wduuhk4mz8vy-6

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-08-07 10:15:52 +0000
+++ b/ChangeLog 2014-08-09 06:57:59 +0000
@@ -1,3 +1,10 @@
+2014-08-09  Paul Eggert  <address@hidden>
+
+       Merge from gnulib, incorporating:
+       2014-08-07 getdtablesize: fall back on sysconf (_SC_OPEN_MAX)
+       2014-08-05 sys_select: fix FD_ZERO problem on Solaris 10
+       * lib/getdtablesize.c, lib/sys_select.in.h: Update from gnulib.
+
 2014-08-07  Reuben Thomas  <address@hidden>
 
        * README: ``MSDOG'' becomes ``MS-DOS''.

=== modified file 'lib/getdtablesize.c'
--- a/lib/getdtablesize.c       2014-01-01 07:43:34 +0000
+++ b/lib/getdtablesize.c       2014-08-09 06:57:59 +0000
@@ -104,4 +104,12 @@
   return getdtablesize ();
 }
 
+#elif defined _SC_OPEN_MAX
+
+int
+getdtablesize (void)
+{
+  return sysconf (_SC_OPEN_MAX);
+}
+
 #endif

=== modified file 'lib/sys_select.in.h'
--- a/lib/sys_select.in.h       2014-01-01 07:43:34 +0000
+++ b/lib/sys_select.in.h       2014-08-09 06:57:59 +0000
@@ -24,8 +24,8 @@
    On Cygwin, <sys/time.h> includes <sys/select.h>.
    Simply delegate to the system's header in this case.  */
 #if (@HAVE_SYS_SELECT_H@                                                \
+     && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H             \
      && ((defined __osf__ && defined _SYS_TYPES_H_                      \
-          && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H         \
           && defined _OSF_SOURCE)                                       \
          || (defined __sun && defined _SYS_TYPES_H                      \
              && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE)   \
@@ -36,12 +36,13 @@
 
 #elif (@HAVE_SYS_SELECT_H@                                              \
        && (defined _CYGWIN_SYS_TIME_H                                   \
-           || (defined __osf__ && defined _SYS_TIME_H_                  \
-               && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H    \
-               && defined _OSF_SOURCE)                                  \
-           || (defined __sun && defined _SYS_TIME_H                     \
-               && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \
-                   || defined __EXTENSIONS__))))
+           || (!defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H       \
+               && ((defined __osf__ && defined _SYS_TIME_H_             \
+                    && defined _OSF_SOURCE)                             \
+                   || (defined __sun && defined _SYS_TIME_H             \
+                       && (! (defined _XOPEN_SOURCE                     \
+                              || defined _POSIX_C_SOURCE)               \
+                           || defined __EXTENSIONS__))))))
 
 # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H
 # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@