mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-29 07:58:28 +00:00
68a256c892
Make the following changes by hand, and run 'admin/merge-gnulib'. * .gitignore: Add lib/malloc/*.gl.h. * admin/merge-gnulib: Copy lib/af_alg.h and lib/save-cwd.h directly from Gnulib, without worrying about Gnulib modules, as these files are special cases. (AVOIDED_MODULES): Remove malloc-posix. * lib/malloc.c, lib/realloc.c, m4/malloc.m4, m4/realloc.m4: * m4/year2038.m4: New files, copied from Gnulib. * lib/malloca.c, lib/malloca.h: * m4/close-stream.m4, m4/glibc21.m4, m4/malloca.m4: Remove. These are either no longer present in Gnulib, or are no longer needed by modules that Emacs uses. * oldXMenu/AddPane.c, oldXmenu/Addsel.c: Include XmenuInt.h first; needed for new Gnulib. * src/xmenu.c: Call emacs_abort, not abort.
328 lines
12 KiB
C
328 lines
12 KiB
C
/* Substitute for <sys/select.h>.
|
|
Copyright (C) 2007-2021 Free Software Foundation, Inc.
|
|
|
|
This file is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU Lesser General Public License as
|
|
published by the Free Software Foundation; either version 2.1 of the
|
|
License, or (at your option) any later version.
|
|
|
|
This file is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public License
|
|
along with this program. If not, see <https://www.gnu.org/licenses/>. */
|
|
|
|
# if __GNUC__ >= 3
|
|
@PRAGMA_SYSTEM_HEADER@
|
|
# endif
|
|
@PRAGMA_COLUMNS@
|
|
|
|
/* On OSF/1 and Solaris 2.6, <sys/types.h> and <sys/time.h>
|
|
both include <sys/select.h>.
|
|
On Cygwin and OpenBSD, <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 _OSF_SOURCE) \
|
|
|| (defined __sun && defined _SYS_TYPES_H \
|
|
&& (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \
|
|
|| defined __EXTENSIONS__))))
|
|
|
|
# define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H
|
|
# @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@
|
|
|
|
#elif (@HAVE_SYS_SELECT_H@ \
|
|
&& (defined _CYGWIN_SYS_TIME_H \
|
|
|| (!defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \
|
|
&& ((defined __osf__ && defined _SYS_TIME_H_ \
|
|
&& defined _OSF_SOURCE) \
|
|
|| (defined __OpenBSD__ && defined _SYS_TIME_H_) \
|
|
|| (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@
|
|
|
|
/* On IRIX 6.5, <sys/timespec.h> includes <sys/types.h>, which includes
|
|
<sys/bsd_types.h>, which includes <sys/select.h>. At this point we cannot
|
|
include <signal.h>, because that includes <internal/signal_core.h>, which
|
|
gives a syntax error because <sys/timespec.h> has not been completely
|
|
processed. Simply delegate to the system's header in this case. */
|
|
#elif @HAVE_SYS_SELECT_H@ && defined __sgi && (defined _SYS_BSD_TYPES_H && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_BSD_TYPES_H)
|
|
|
|
# define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_BSD_TYPES_H
|
|
# @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@
|
|
|
|
/* On OpenBSD 5.0, <pthread.h> includes <sys/types.h>, which includes
|
|
<sys/select.h>. At this point we cannot include <signal.h>, because that
|
|
includes gnulib's pthread.h override, which gives a syntax error because
|
|
/usr/include/pthread.h has not been completely processed. Simply delegate
|
|
to the system's header in this case. */
|
|
#elif @HAVE_SYS_SELECT_H@ && defined __OpenBSD__ && (defined _PTHREAD_H_ && !defined PTHREAD_MUTEX_INITIALIZER)
|
|
|
|
# @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@
|
|
|
|
#else
|
|
|
|
#ifndef _@GUARD_PREFIX@_SYS_SELECT_H
|
|
|
|
/* On many platforms, <sys/select.h> assumes prior inclusion of
|
|
<sys/types.h>. Also, mingw defines sigset_t there, instead of
|
|
in <signal.h> where it belongs. */
|
|
#include <sys/types.h>
|
|
|
|
#if @HAVE_SYS_SELECT_H@
|
|
|
|
/* On OSF/1 4.0, <sys/select.h> provides only a forward declaration
|
|
of 'struct timeval', and no definition of this type.
|
|
Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select()
|
|
in <sys/time.h>.
|
|
But avoid namespace pollution on glibc systems and "unknown type
|
|
name" problems on Cygwin. */
|
|
# if !(defined __GLIBC__ || defined __CYGWIN__)
|
|
# include <sys/time.h>
|
|
# endif
|
|
|
|
/* On AIX 7 and Solaris 10, <sys/select.h> provides an FD_ZERO implementation
|
|
that relies on memset(), but without including <string.h>.
|
|
But in any case avoid namespace pollution on glibc systems. */
|
|
# if (defined __OpenBSD__ || defined _AIX || defined __sun || defined __osf__ || defined __BEOS__) \
|
|
&& ! defined __GLIBC__
|
|
# include <string.h>
|
|
# endif
|
|
|
|
/* The include_next requires a split double-inclusion guard. */
|
|
# @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@
|
|
|
|
#endif
|
|
|
|
/* Get definition of 'sigset_t'.
|
|
But avoid namespace pollution on glibc systems and "unknown type
|
|
name" problems on Cygwin.
|
|
On OS/2 kLIBC, sigset_t is defined in <sys/select.h>, too. In addition,
|
|
if <sys/param.h> is included, <types.h> -> <sys/types.h> -> <sys/select.h>
|
|
are included. Then <signal.h> -> <pthread.h> are included by GNULIB. By the
|
|
way, <pthread.h> requires PAGE_SIZE defined in <sys/param.h>. However,
|
|
<sys/param.h> has not been processed, yet. As a result, 'PAGE_SIZE'
|
|
undeclared error occurs in <pthread.h>.
|
|
Do this after the include_next (for the sake of OpenBSD 5.0) but before
|
|
the split double-inclusion guard (for the sake of Solaris). */
|
|
#if !((defined __GLIBC__ || defined __CYGWIN__ || defined __KLIBC__) \
|
|
&& !defined __UCLIBC__)
|
|
# include <signal.h>
|
|
#endif
|
|
|
|
#ifndef _@GUARD_PREFIX@_SYS_SELECT_H
|
|
#define _@GUARD_PREFIX@_SYS_SELECT_H
|
|
|
|
#if !@HAVE_SYS_SELECT_H@
|
|
/* A platform that lacks <sys/select.h>. */
|
|
/* Get the 'struct timeval' and 'fd_set' types and the FD_* macros
|
|
on most platforms. */
|
|
# include <sys/time.h>
|
|
/* On HP-UX 11, <sys/time.h> provides an FD_ZERO implementation
|
|
that relies on memset(), but without including <string.h>. */
|
|
# if defined __hpux
|
|
# include <string.h>
|
|
# endif
|
|
/* On native Windows platforms:
|
|
Get the 'fd_set' type.
|
|
Get the close() declaration before we override it. */
|
|
# if @HAVE_WINSOCK2_H@
|
|
# if !defined _GL_INCLUDING_WINSOCK2_H
|
|
# define _GL_INCLUDING_WINSOCK2_H
|
|
# include <winsock2.h>
|
|
# undef _GL_INCLUDING_WINSOCK2_H
|
|
# endif
|
|
# include <io.h>
|
|
# endif
|
|
#endif
|
|
|
|
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
|
|
|
|
/* The definition of _GL_WARN_ON_USE is copied here. */
|
|
|
|
|
|
/* Fix some definitions from <winsock2.h>. */
|
|
|
|
#if @HAVE_WINSOCK2_H@
|
|
|
|
# if !GNULIB_defined_rpl_fd_isset
|
|
|
|
/* Re-define FD_ISSET to avoid a WSA call while we are not using
|
|
network sockets. */
|
|
static int
|
|
rpl_fd_isset (SOCKET fd, fd_set * set)
|
|
{
|
|
u_int i;
|
|
if (set == NULL)
|
|
return 0;
|
|
|
|
for (i = 0; i < set->fd_count; i++)
|
|
if (set->fd_array[i] == fd)
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
# define GNULIB_defined_rpl_fd_isset 1
|
|
# endif
|
|
|
|
# undef FD_ISSET
|
|
# define FD_ISSET(fd, set) rpl_fd_isset(fd, set)
|
|
|
|
#endif
|
|
|
|
/* Hide some function declarations from <winsock2.h>. */
|
|
|
|
#if @HAVE_WINSOCK2_H@
|
|
# if !defined _@GUARD_PREFIX@_UNISTD_H
|
|
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
# undef close
|
|
# define close close_used_without_including_unistd_h
|
|
# elif !defined __clang__
|
|
_GL_WARN_ON_USE (close,
|
|
"close() used without including <unistd.h>");
|
|
# endif
|
|
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
# undef gethostname
|
|
# define gethostname gethostname_used_without_including_unistd_h
|
|
# elif !defined __clang__
|
|
_GL_WARN_ON_USE (gethostname,
|
|
"gethostname() used without including <unistd.h>");
|
|
# endif
|
|
# endif
|
|
# if !defined _@GUARD_PREFIX@_SYS_SOCKET_H
|
|
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
# undef socket
|
|
# define socket socket_used_without_including_sys_socket_h
|
|
# undef connect
|
|
# define connect connect_used_without_including_sys_socket_h
|
|
# undef accept
|
|
# define accept accept_used_without_including_sys_socket_h
|
|
# undef bind
|
|
# define bind bind_used_without_including_sys_socket_h
|
|
# undef getpeername
|
|
# define getpeername getpeername_used_without_including_sys_socket_h
|
|
# undef getsockname
|
|
# define getsockname getsockname_used_without_including_sys_socket_h
|
|
# undef getsockopt
|
|
# define getsockopt getsockopt_used_without_including_sys_socket_h
|
|
# undef listen
|
|
# define listen listen_used_without_including_sys_socket_h
|
|
# undef recv
|
|
# define recv recv_used_without_including_sys_socket_h
|
|
# undef send
|
|
# define send send_used_without_including_sys_socket_h
|
|
# undef recvfrom
|
|
# define recvfrom recvfrom_used_without_including_sys_socket_h
|
|
# undef sendto
|
|
# define sendto sendto_used_without_including_sys_socket_h
|
|
# undef setsockopt
|
|
# define setsockopt setsockopt_used_without_including_sys_socket_h
|
|
# undef shutdown
|
|
# define shutdown shutdown_used_without_including_sys_socket_h
|
|
# elif !defined __clang__
|
|
_GL_WARN_ON_USE (socket,
|
|
"socket() used without including <sys/socket.h>");
|
|
_GL_WARN_ON_USE (connect,
|
|
"connect() used without including <sys/socket.h>");
|
|
_GL_WARN_ON_USE (accept,
|
|
"accept() used without including <sys/socket.h>");
|
|
_GL_WARN_ON_USE (bind,
|
|
"bind() used without including <sys/socket.h>");
|
|
_GL_WARN_ON_USE (getpeername,
|
|
"getpeername() used without including <sys/socket.h>");
|
|
_GL_WARN_ON_USE (getsockname,
|
|
"getsockname() used without including <sys/socket.h>");
|
|
_GL_WARN_ON_USE (getsockopt,
|
|
"getsockopt() used without including <sys/socket.h>");
|
|
_GL_WARN_ON_USE (listen,
|
|
"listen() used without including <sys/socket.h>");
|
|
_GL_WARN_ON_USE (recv,
|
|
"recv() used without including <sys/socket.h>");
|
|
_GL_WARN_ON_USE (send,
|
|
"send() used without including <sys/socket.h>");
|
|
_GL_WARN_ON_USE (recvfrom,
|
|
"recvfrom() used without including <sys/socket.h>");
|
|
_GL_WARN_ON_USE (sendto,
|
|
"sendto() used without including <sys/socket.h>");
|
|
_GL_WARN_ON_USE (setsockopt,
|
|
"setsockopt() used without including <sys/socket.h>");
|
|
_GL_WARN_ON_USE (shutdown,
|
|
"shutdown() used without including <sys/socket.h>");
|
|
# endif
|
|
# endif
|
|
#endif
|
|
|
|
|
|
#if @GNULIB_PSELECT@
|
|
# if @REPLACE_PSELECT@
|
|
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
# undef pselect
|
|
# define pselect rpl_pselect
|
|
# endif
|
|
_GL_FUNCDECL_RPL (pselect, int,
|
|
(int, fd_set *restrict, fd_set *restrict, fd_set *restrict,
|
|
struct timespec const *restrict, const sigset_t *restrict));
|
|
_GL_CXXALIAS_RPL (pselect, int,
|
|
(int, fd_set *restrict, fd_set *restrict, fd_set *restrict,
|
|
struct timespec const *restrict, const sigset_t *restrict));
|
|
# else
|
|
# if !@HAVE_PSELECT@
|
|
_GL_FUNCDECL_SYS (pselect, int,
|
|
(int, fd_set *restrict, fd_set *restrict, fd_set *restrict,
|
|
struct timespec const *restrict, const sigset_t *restrict));
|
|
# endif
|
|
_GL_CXXALIAS_SYS (pselect, int,
|
|
(int, fd_set *restrict, fd_set *restrict, fd_set *restrict,
|
|
struct timespec const *restrict, const sigset_t *restrict));
|
|
# endif
|
|
_GL_CXXALIASWARN (pselect);
|
|
#elif defined GNULIB_POSIXCHECK
|
|
# undef pselect
|
|
# if HAVE_RAW_DECL_PSELECT
|
|
_GL_WARN_ON_USE (pselect, "pselect is not portable - "
|
|
"use gnulib module pselect for portability");
|
|
# endif
|
|
#endif
|
|
|
|
#if @GNULIB_SELECT@
|
|
# if @REPLACE_SELECT@
|
|
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
# undef select
|
|
# define select rpl_select
|
|
# endif
|
|
_GL_FUNCDECL_RPL (select, int,
|
|
(int, fd_set *restrict, fd_set *restrict, fd_set *restrict,
|
|
struct timeval *restrict));
|
|
_GL_CXXALIAS_RPL (select, int,
|
|
(int, fd_set *restrict, fd_set *restrict, fd_set *restrict,
|
|
timeval *restrict));
|
|
# else
|
|
_GL_CXXALIAS_SYS (select, int,
|
|
(int, fd_set *restrict, fd_set *restrict, fd_set *restrict,
|
|
timeval *restrict));
|
|
# endif
|
|
_GL_CXXALIASWARN (select);
|
|
#elif @HAVE_WINSOCK2_H@
|
|
# undef select
|
|
# define select select_used_without_requesting_gnulib_module_select
|
|
#elif defined GNULIB_POSIXCHECK
|
|
# undef select
|
|
# if HAVE_RAW_DECL_SELECT
|
|
_GL_WARN_ON_USE (select, "select is not always POSIX compliant - "
|
|
"use gnulib module select for portability");
|
|
# endif
|
|
#endif
|
|
|
|
|
|
#endif /* _@GUARD_PREFIX@_SYS_SELECT_H */
|
|
#endif /* _@GUARD_PREFIX@_SYS_SELECT_H */
|
|
#endif /* OSF/1 */
|