From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 9 Aug 2014 06:57:59 +0000 (-0700)
Subject: Merge from gnulib.
X-Git-Tag: emacs-25.0.90~2635^2~679^2~501
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fea30ac1c84d0c3d2fff34a309980c53e3db2fe8;p=emacs.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index b7b2ce9a22f..5b329544e52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-08-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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  <rrt@sc3d.org>
 
 	* README: ``MSDOG'' becomes ``MS-DOS''.
diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c
index 946738cdb68..f0c62713a65 100644
--- a/lib/getdtablesize.c
+++ b/lib/getdtablesize.c
@@ -104,4 +104,12 @@ rpl_getdtablesize(void)
   return getdtablesize ();
 }
 
+#elif defined _SC_OPEN_MAX
+
+int
+getdtablesize (void)
+{
+  return sysconf (_SC_OPEN_MAX);
+}
+
 #endif
diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h
index a876b9caa3f..58508b0c5e5 100644
--- a/lib/sys_select.in.h
+++ b/lib/sys_select.in.h
@@ -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@