mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 14:30:50 -08:00
Code Issues Projects Releases Wiki Activity

Merge from gnulib.

Browse source 
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.
This commit is contained in:
Paul Eggert 2014-08-08 23:57:59 -07:00
parent b2164af470
commit fea30ac1c8
3 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> 2014-08-07 Reuben Thomas <rrt@sc3d.org>
* README: ``MSDOG'' becomes ``MS-DOS''. * README: ``MSDOG'' becomes ``MS-DOS''.

8
lib/getdtablesize.c
View file

@ -104,4 +104,12 @@ rpl_getdtablesize(void)
return getdtablesize (); return getdtablesize ();
} }
#elif defined _SC_OPEN_MAX
int
getdtablesize (void)
{
return sysconf (_SC_OPEN_MAX);
}
#endif #endif

15
lib/sys_select.in.h
View file

@ -24,8 +24,8 @@
On Cygwin, <sys/time.h> includes <sys/select.h>. On Cygwin, <sys/time.h> includes <sys/select.h>.
Simply delegate to the system's header in this case. */ Simply delegate to the system's header in this case. */
#if (@HAVE_SYS_SELECT_H@ \ #if (@HAVE_SYS_SELECT_H@ \
&& !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H \
&& ((defined __osf__ && defined _SYS_TYPES_H_ \ && ((defined __osf__ && defined _SYS_TYPES_H_ \
&& !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \
&& defined _OSF_SOURCE) \ && defined _OSF_SOURCE) \
|| (defined __sun && defined _SYS_TYPES_H \ || (defined __sun && defined _SYS_TYPES_H \
&& (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \ && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \
@ -36,12 +36,13 @@
#elif (@HAVE_SYS_SELECT_H@ \ #elif (@HAVE_SYS_SELECT_H@ \
&& (defined _CYGWIN_SYS_TIME_H \ && (defined _CYGWIN_SYS_TIME_H \
|| (defined __osf__ && defined _SYS_TIME_H_ \ || (!defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \
&& !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \ && ((defined __osf__ && defined _SYS_TIME_H_ \
&& defined _OSF_SOURCE) \ && defined _OSF_SOURCE) \
|| (defined __sun && defined _SYS_TIME_H \ || (defined __sun && defined _SYS_TIME_H \
&& (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \ && (! (defined _XOPEN_SOURCE \
|| defined __EXTENSIONS__)))) || defined _POSIX_C_SOURCE) \
|| defined __EXTENSIONS__))))))
# define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H
# @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@ # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@