4a626d0a0f
2015-08-24 Pedro Alves <palves@redhat.com> * gnulib/update-gnulib.sh (GNULIB_COMMIT_SHA1): Set to 1029a8112290f6eee9d7878a391c49db42c999bd. * gnulib/configure, gnulib/config.in, gnulib/aclocal.m4: Regenerate. * gnulib/import/Makefile.am: Update. * gnulib/import/Makefile.in: Update. * gnulib/import/alloca.in.h: Update. * gnulib/import/basename-lgpl.c: Update. * gnulib/import/canonicalize-lgpl.c: Update. * gnulib/import/config.charset: Update. * gnulib/import/dirent.in.h: Update. * gnulib/import/dirfd.c: Update. * gnulib/import/dirname-lgpl.c: Update. * gnulib/import/dirname.h: Update. * gnulib/import/dosname.h: Update. * gnulib/import/errno.in.h: Update. * gnulib/import/extra/snippet/arg-nonnull.h: Update. * gnulib/import/extra/snippet/c++defs.h: Update. * gnulib/import/extra/snippet/warn-on-use.h: Update. * gnulib/import/extra/update-copyright: Update. * gnulib/import/float+.h: Update. * gnulib/import/float.c: Update. * gnulib/import/float.in.h: Update. * gnulib/import/fnmatch.c: Update. * gnulib/import/fnmatch.in.h: Update. * gnulib/import/fnmatch_loop.c: Update. * gnulib/import/fpucw.h: Update. * gnulib/import/frexp.c: Update. * gnulib/import/frexpl.c: Update. * gnulib/import/gettimeofday.c: Update. * gnulib/import/inttypes.in.h: Update. * gnulib/import/isnan.c: Update. * gnulib/import/isnand-nolibm.h: Update. * gnulib/import/isnand.c: Update. * gnulib/import/isnanl-nolibm.h: Update. * gnulib/import/isnanl.c: Update. * gnulib/import/itold.c: Update. * gnulib/import/localcharset.c: Update. * gnulib/import/localcharset.h: Update. * gnulib/import/lstat.c: Update. * gnulib/import/m4/00gnulib.m4: Update. * gnulib/import/m4/absolute-header.m4: Update. * gnulib/import/m4/alloca.m4: Update. * gnulib/import/m4/canonicalize.m4: Update. * gnulib/import/m4/codeset.m4: Update. * gnulib/import/m4/configmake.m4: Update. * gnulib/import/m4/dirent_h.m4: Update. * gnulib/import/m4/dirfd.m4: Update. * gnulib/import/m4/dirname.m4: Update. * gnulib/import/m4/double-slash-root.m4: Update. * gnulib/import/m4/eealloc.m4: Update. * gnulib/import/m4/errno_h.m4: Update. * gnulib/import/m4/exponentd.m4: Update. * gnulib/import/m4/exponentl.m4: Update. * gnulib/import/m4/extensions.m4: Update. * gnulib/import/m4/extern-inline.m4: Update. * gnulib/import/m4/fcntl-o.m4: Update. * gnulib/import/m4/float_h.m4: Update. * gnulib/import/m4/fnmatch.m4: Update. * gnulib/import/m4/fpieee.m4: Update. * gnulib/import/m4/frexp.m4: Update. * gnulib/import/m4/frexpl.m4: Update. * gnulib/import/m4/gettimeofday.m4: Update. * gnulib/import/m4/glibc21.m4: Update. * gnulib/import/m4/gnulib-cache.m4: Update. * gnulib/import/m4/gnulib-common.m4: Update. * gnulib/import/m4/gnulib-comp.m4: Update. * gnulib/import/m4/gnulib-tool.m4: Update. * gnulib/import/m4/include_next.m4: Update. * gnulib/import/m4/inttypes-pri.m4: Update. * gnulib/import/m4/inttypes.m4: Update. * gnulib/import/m4/isnand.m4: Update. * gnulib/import/m4/isnanl.m4: Update. * gnulib/import/m4/largefile.m4: Update. * gnulib/import/m4/localcharset.m4: Update. * gnulib/import/m4/locale-fr.m4: Update. * gnulib/import/m4/locale-ja.m4: Update. * gnulib/import/m4/locale-zh.m4: Update. * gnulib/import/m4/longlong.m4: Update. * gnulib/import/m4/lstat.m4: Update. * gnulib/import/m4/malloc.m4: Update. * gnulib/import/m4/malloca.m4: Update. * gnulib/import/m4/math_h.m4: Update. * gnulib/import/m4/mbrtowc.m4: Update. * gnulib/import/m4/mbsinit.m4: Update. * gnulib/import/m4/mbsrtowcs.m4: Update. * gnulib/import/m4/mbstate_t.m4: Update. * gnulib/import/m4/memchr.m4: Update. * gnulib/import/m4/memmem.m4: Update. * gnulib/import/m4/mmap-anon.m4: Update. * gnulib/import/m4/multiarch.m4: Update. * gnulib/import/m4/nocrash.m4: Update. * gnulib/import/m4/off_t.m4: Update. * gnulib/import/m4/pathmax.m4: Update. * gnulib/import/m4/readlink.m4: Update. * gnulib/import/m4/rename.m4: Update. * gnulib/import/m4/rmdir.m4: Update. * gnulib/import/m4/ssize_t.m4: Update. * gnulib/import/m4/stat.m4: Update. * gnulib/import/m4/stdbool.m4: Update. * gnulib/import/m4/stddef_h.m4: Update. * gnulib/import/m4/stdint.m4: Update. * gnulib/import/m4/stdio_h.m4: Update. * gnulib/import/m4/stdlib_h.m4: Update. * gnulib/import/m4/string_h.m4: Update. * gnulib/import/m4/strstr.m4: Update. * gnulib/import/m4/strtok_r.m4: Update. * gnulib/import/m4/sys_socket_h.m4: Update. * gnulib/import/m4/sys_stat_h.m4: Update. * gnulib/import/m4/sys_time_h.m4: Update. * gnulib/import/m4/sys_types_h.m4: Update. * gnulib/import/m4/time_h.m4: Update. * gnulib/import/m4/unistd_h.m4: Update. * gnulib/import/m4/warn-on-use.m4: Update. * gnulib/import/m4/wchar_h.m4: Update. * gnulib/import/m4/wchar_t.m4: Update. * gnulib/import/m4/wctype_h.m4: Update. * gnulib/import/m4/wint_t.m4: Update. * gnulib/import/malloc.c: Update. * gnulib/import/malloca.c: Update. * gnulib/import/malloca.h: Update. * gnulib/import/math.in.h: Update. * gnulib/import/mbrtowc.c: Update. * gnulib/import/mbsinit.c: Update. * gnulib/import/mbsrtowcs-impl.h: Update. * gnulib/import/mbsrtowcs-state.c: Update. * gnulib/import/mbsrtowcs.c: Update. * gnulib/import/memchr.c: Update. * gnulib/import/memmem.c: Update. * gnulib/import/pathmax.h: Update. * gnulib/import/readlink.c: Update. * gnulib/import/ref-add.sin: Update. * gnulib/import/ref-del.sin: Update. * gnulib/import/rename.c: Update. * gnulib/import/rmdir.c: Update. * gnulib/import/same-inode.h: Update. * gnulib/import/stat.c: Update. * gnulib/import/stdbool.in.h: Update. * gnulib/import/stddef.in.h: Update. * gnulib/import/stdint.in.h: Update. * gnulib/import/stdio.c: Update. * gnulib/import/stdio.in.h: Update. * gnulib/import/stdlib.in.h: Update. * gnulib/import/str-two-way.h: Update. * gnulib/import/streq.h: Update. * gnulib/import/string.in.h: Update. * gnulib/import/stripslash.c: Update. * gnulib/import/strnlen1.c: Update. * gnulib/import/strnlen1.h: Update. * gnulib/import/strstr.c: Update. * gnulib/import/strtok_r.c: Update. * gnulib/import/sys_stat.in.h: Update. * gnulib/import/sys_time.in.h: Update. * gnulib/import/sys_types.in.h: Update. * gnulib/import/time.in.h: Update. * gnulib/import/unistd.in.h: Update. * gnulib/import/verify.h: Update. * gnulib/import/wchar.in.h: Update. * gnulib/import/wctype.in.h: Update. * gnulib/import/gettimeofday.c: New file. * gnulib/import/m4/absolute-header.m4: New file. * gnulib/import/m4/gettimeofday.m4: New file. * gnulib/import/m4/sys_socket_h.m4: New file. * gnulib/import/m4/sys_time_h.m4: New file. * gnulib/import/stdio.c: Delete file. * gnulib/import/sys_time.in.h: New file.
213 lines
7.5 KiB
C
213 lines
7.5 KiB
C
/* Provide a more complete sys/time.h.
|
|
|
|
Copyright (C) 2007-2015 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
|
|
the Free Software Foundation; either version 3, or (at your option)
|
|
any later version.
|
|
|
|
This program 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 General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
/* Written by Paul Eggert. */
|
|
|
|
#ifndef _@GUARD_PREFIX@_SYS_TIME_H
|
|
|
|
#if __GNUC__ >= 3
|
|
@PRAGMA_SYSTEM_HEADER@
|
|
#endif
|
|
@PRAGMA_COLUMNS@
|
|
|
|
/* On Cygwin and on many BSDish systems, <sys/time.h> includes itself
|
|
recursively via <sys/select.h>.
|
|
Simply delegate to the system's header in this case; it is a no-op.
|
|
Without this extra ifdef, the C++ gettimeofday declaration below
|
|
would be a forward declaration in gnulib's nested <sys/time.h>. */
|
|
#if defined _CYGWIN_SYS_TIME_H || defined _SYS_TIME_H || defined _SYS_TIME_H_
|
|
# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
|
|
#else
|
|
|
|
/* The include_next requires a split double-inclusion guard. */
|
|
#if @HAVE_SYS_TIME_H@
|
|
# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
|
|
#endif
|
|
|
|
#ifndef _@GUARD_PREFIX@_SYS_TIME_H
|
|
#define _@GUARD_PREFIX@_SYS_TIME_H
|
|
|
|
#if ! @HAVE_SYS_TIME_H@
|
|
# include <time.h>
|
|
#endif
|
|
|
|
/* On native Windows with MSVC, get the 'struct timeval' type.
|
|
Also, on native Windows with a 64-bit time_t, where we are overriding the
|
|
'struct timeval' type, get all declarations of system functions whose
|
|
signature contains 'struct timeval'. */
|
|
#if (defined _MSC_VER || @REPLACE_STRUCT_TIMEVAL@) && @HAVE_WINSOCK2_H@ && !defined _GL_INCLUDING_WINSOCK2_H
|
|
# define _GL_INCLUDING_WINSOCK2_H
|
|
# include <winsock2.h>
|
|
# undef _GL_INCLUDING_WINSOCK2_H
|
|
#endif
|
|
|
|
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
|
|
|
|
/* The definition of _GL_ARG_NONNULL is copied here. */
|
|
|
|
/* The definition of _GL_WARN_ON_USE is copied here. */
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#if !@HAVE_STRUCT_TIMEVAL@ || @REPLACE_STRUCT_TIMEVAL@
|
|
|
|
# if @REPLACE_STRUCT_TIMEVAL@
|
|
# define timeval rpl_timeval
|
|
# endif
|
|
|
|
# if !GNULIB_defined_struct_timeval
|
|
struct timeval
|
|
{
|
|
time_t tv_sec;
|
|
long int tv_usec;
|
|
};
|
|
# define GNULIB_defined_struct_timeval 1
|
|
# endif
|
|
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#if @GNULIB_GETTIMEOFDAY@
|
|
# if @REPLACE_GETTIMEOFDAY@
|
|
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
# undef gettimeofday
|
|
# define gettimeofday rpl_gettimeofday
|
|
# endif
|
|
_GL_FUNCDECL_RPL (gettimeofday, int,
|
|
(struct timeval *restrict, void *restrict)
|
|
_GL_ARG_NONNULL ((1)));
|
|
_GL_CXXALIAS_RPL (gettimeofday, int,
|
|
(struct timeval *restrict, void *restrict));
|
|
# else
|
|
# if !@HAVE_GETTIMEOFDAY@
|
|
_GL_FUNCDECL_SYS (gettimeofday, int,
|
|
(struct timeval *restrict, void *restrict)
|
|
_GL_ARG_NONNULL ((1)));
|
|
# endif
|
|
/* Need to cast, because on glibc systems, by default, the second argument is
|
|
struct timezone *. */
|
|
_GL_CXXALIAS_SYS_CAST (gettimeofday, int,
|
|
(struct timeval *restrict, void *restrict));
|
|
# endif
|
|
_GL_CXXALIASWARN (gettimeofday);
|
|
#elif defined GNULIB_POSIXCHECK
|
|
# undef gettimeofday
|
|
# if HAVE_RAW_DECL_GETTIMEOFDAY
|
|
_GL_WARN_ON_USE (gettimeofday, "gettimeofday is unportable - "
|
|
"use gnulib module gettimeofday for portability");
|
|
# endif
|
|
#endif
|
|
|
|
/* Hide some function declarations from <winsock2.h>. */
|
|
|
|
#if defined _MSC_VER && @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
|
|
# else
|
|
_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
|
|
# else
|
|
_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
|
|
# else
|
|
_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
|
|
# if !defined _@GUARD_PREFIX@_SYS_SELECT_H
|
|
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
# undef select
|
|
# define select select_used_without_including_sys_select_h
|
|
# else
|
|
_GL_WARN_ON_USE (select,
|
|
"select() used without including <sys/select.h>");
|
|
# endif
|
|
# endif
|
|
#endif
|
|
|
|
#endif /* _@GUARD_PREFIX@_SYS_TIME_H */
|
|
#endif /* _CYGWIN_SYS_TIME_H */
|
|
#endif /* _@GUARD_PREFIX@_SYS_TIME_H */
|