c0c3707ff4
This patch allows us to remove a workaround in common-defs.h due to the gnulib fix in: https://lists.gnu.org/archive/html/bug-gnulib/2019-11/msg00024.html All of GDB's local Gnulib patches were already fixed upstream per their descriptions, so this patch removes them all. The problem listed here: https://sourceware.org/ml/gdb-patches/2019-08/msg00553.html was probably partially fixed by moving gnulib to the toplevel; for the remainder, I am setting MAKEOVERRIDES to empty in gnulib/Makefile.am. See also the comment there (it fixes an issue with compilers that don't use C99/C11 by default such as GCC 4.8.5, the default on Centos 7). gdb/ChangeLog: 2019-12-16 Christian Biesinger <cbiesinger@google.com> * gdbsupport/common-defs.h: Remove workaround for a gnulib bug (we no longer need to include time.h before pathmax.h) gnulib/ChangeLog: 2019-12-16 Christian Biesinger <cbiesinger@google.com> * Makefile.am: Set MAKEOVERRIDES. * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * config.in: Regenerate. * configure: Regenerate. * import/Makefile.am: Update. * import/Makefile.in: Regenerate. * import/_Noreturn.h: New file. * import/alloca.c (i00afunc): Update. * import/alloca.in.h (if): Update. * import/arg-nonnull.h: Rename from import/extra/snippet/arg-nonnull.h. * import/arpa_inet.in.h (if): Update. * import/assure.h: Update. * import/at-func.c: Update. * import/basename-lgpl.c: Update. * import/canonicalize-lgpl.c (if): Update. * import/c++defs.h: Rename from import/extra/snippet/c++defs.h. * import/cdefs.h: New file. * import/chdir-long.c: Update. * import/chdir-long.h: Update. * import/cloexec.c: Update. * import/cloexec.h: Update. * import/close.c: Update. * import/closedir.c: Update. * import/config.charset: Remove. * import/dirent-private.h: Update. * import/dirent.in.h: Update. * import/dirfd.c: Update. * import/dirname-lgpl.c: Update. * import/dirname.h (base_name): Update. * import/dosname.h (if): Update. * import/dup-safer-flag.c: New file. * import/dup-safer.c: Update. * import/dup.c: Update. * import/dup2.c (if): Update. (dup2_nothrow): Update. (ms_windows_dup2): Update. * import/errno.in.h (if): Update. (elif): Update. * import/error.c (if): Update. (strerror_r): Update. (program_name): Update. (error): Update. (error_at_line): Update. * import/error.h: Update. * import/exitfail.c: Update. * import/exitfail.h: Update. * import/extra/config.rpath: Update. * import/extra/snippet/_Noreturn.h: Remove. * import/extra/update-copyright: Update. * import/fchdir.c: Update. * import/fcntl.c (rpl_fcntl): Update. (INCL_DOS): Update. (if): Update. (rpl_fcntl_DUPFD): Update. (rpl_fcntl_DUPFD_CLOEXEC): Update. (klibc_fcntl): Update. (fcntl): Update. (have_dupfd_cloexec): Update. * import/fcntl.in.h (if): Update. (creat): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (_GL_WARN_ON_USE): Update. (O_CLOEXEC): Update. (GNULIB_defined_O_CLOEXEC): Update. * import/fd-hook.c: Update. * import/fd-hook.h: Update. * import/fd-safer-flag.c: New file. * import/fd-safer.c: Update. * import/fdopendir.c: Update. * import/filename.h: Update. * import/filenamecat-lgpl.c (longest_relative_suffix): Update. (mfile_name_concat): Update. * import/filenamecat.h: Update. * import/flexmember.h: Update. * import/float+.h: Update. * import/float.c: Update. * import/float.in.h (LDBL_MIN): Update. * import/fnmatch.c (__builtin_expect): Update. (FALLTHROUGH): Update. * import/fnmatch.in.h (_FNMATCH_H): Update. (_): Update. (fnmatch): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (_GL_WARN_ON_USE): Update. * import/fnmatch_loop.c (FCT): Update. (EXT): Update. * import/fpucw.h (GET_FPUCW): Update. (SET_FPUCW): Update. * import/frexp.c: Update. * import/frexpl.c: Update. * import/fstat.c (stat): Update. (fstat): Update. (WINDOWS_NATIVE): Update. (fstat_nothrow): Update. (WIN32_LEAN_AND_MEAN): Update. * import/fstatat.c (normal_fstatat): Update. (rpl_fstatat): Update. * import/getcwd-lgpl.c (rpl_getcwd): Update. * import/getcwd.c (getcwd_nothrow): Update. (getcwd_system): Update. (__getcwd): Update. * import/getdtablesize.c (if): Update. (_setmaxstdio): Update. (_setmaxstdio_nothrow): Update. (getdtablesize): Update. * import/getlogin_r.c (if): Update. (getlogin_r): Update. * import/getprogname.c (getprogname): Update. * import/getprogname.h: Update. * import/gettext.h (if): Update. * import/gettimeofday.c (WINDOWS_NATIVE): Update. (localtime): Update. (GetProcAddress): Update. (gmtime): Update. (void): Update. (struct tm): Update. (rpl_localtime): Update. (initialize): Update. (rpl_gmtime): Update. (tzset): Update. (rpl_tzset): Update. * import/glob-libc.h (_Restrict_): Update. (__size_t): Update. (__need_size_t): Update. (glob): Update. (globfree): Update. (__REDIRECT_NTH): Update. (glob64): Update. (globfree64): Update. (glob_pattern_p): Update. * import/glob.c (POSIX): Update. (if): Update. (__set_errno): Update. (getpwnam_r): Update. (__lstat64): Update. (FLEXIBLE_ARRAY_MEMBER): Update. (__glob_pattern_p): Update. (GETPW_R_SIZE_MAX): Update. (GET_LOGIN_NAME_MAX): Update. (DT_UNKNOWN): Update. (DT_DIR): Update. (DT_LNK): Update. (D_TYPE_TO_RESULT): Update. (readdir_result_might_be_symlink): Update. (readdir_result_might_be_dir): Update. (readdir_result_type): Update. (D_INO_TO_RESULT): Update. (READDIR_RESULT_INITIALIZER): Update. (attribute_hidden): Update. (__attribute_noinline__): Update. (__builtin_expect): Update. (__glibc_unlikely): Update. (__has_builtin): Update. (__glob_pattern_type): Update. (is_dir): Update. (glob): Update. (globfree): Update. (libc_hidden_def): Update. (DIRSEP_CHAR): Update. (prefix_array): Update. (weak_alias): Update. (link_exists2_p): Update. (link_exists_p): Update. (glob_in_dir): Update. (GLOBNAMES_MEMBERS): Update. * import/glob.in.h (_GL_GLOB_H): Update. (_): Update. (__BEGIN_DECLS): Update. (__END_DECLS): Update. (_Restrict_): Update. (__THROW): Update. (__THROWNL): Update. (__size_t): Update. (__USE_GNU): Update. (glob): Update. (globfree): Update. (glob_pattern_p): Update. (__glob_pattern_p): Update. (__GLOB_GNULIB): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. (_GL_WARN_ON_USE): Update. * import/glob_internal.h: New file. * import/glob_pattern_p.c: New file. * import/globfree.c: New file. * import/glthread/lock.c (glthread_rwlock_init_for_glibc): Update. (glthread_rwlock_rdlock_multithreaded): Update. (glthread_once_call): Update. (glthread_once_multithreaded): Update. (glthread_once_singlethreaded): Update. (glthread_recursive_lock_init_multithreaded): Update. (glthread_recursive_lock_lock_multithreaded): Update. (glthread_recursive_lock_unlock_multithreaded): Update. (glthread_recursive_lock_destroy_multithreaded): Update. (glthread_lock_init_func): Update. (glthread_lock_lock_func): Update. (glthread_lock_unlock_func): Update. (glthread_lock_destroy_func): Update. (gl_waitqueue_t): Update. (gl_waitqueue_init): Update. (gl_waitqueue_add): Update. (gl_waitqueue_notify_first): Update. (gl_waitqueue_notify_all): Update. (glthread_rwlock_init_func): Update. (glthread_rwlock_rdlock_func): Update. (glthread_rwlock_wrlock_func): Update. (glthread_rwlock_unlock_func): Update. (glthread_rwlock_destroy_func): Update. (glthread_recursive_lock_init_func): Update. (glthread_recursive_lock_lock_func): Update. (glthread_recursive_lock_unlock_func): Update. (glthread_recursive_lock_destroy_func): Update. (glthread_once_func): Update. * import/glthread/lock.h (c11_threads_in_use): Update. (pthread_in_use): Update. (gl_rwlock_initializer): Update. (glthread_rwlock_init): Update. (glthread_rwlock_init_for_glibc): Update. (pth_in_use): Update. (gl_lock_define): Update. (gl_lock_define_initialized): Update. (gl_lock_initializer): Update. (glthread_lock_init): Update. (glthread_lock_lock): Update. (glthread_lock_unlock): Update. (glthread_lock_destroy): Update. (gl_rwlock_define): Update. (gl_rwlock_define_initialized): Update. (glthread_rwlock_rdlock): Update. (glthread_rwlock_wrlock): Update. (glthread_rwlock_unlock): Update. (glthread_rwlock_destroy): Update. (gl_recursive_lock_define): Update. (gl_recursive_lock_define_initialized): Update. (gl_recursive_lock_initializer): Update. (glthread_recursive_lock_init): Update. (glthread_recursive_lock_lock): Update. (glthread_recursive_lock_unlock): Update. (glthread_recursive_lock_destroy): Update. (gl_once_define): Update. (glthread_once): Update. (glthread_once_multithreaded): Update. (glthread_once_singlethreaded): Update. (thread_in_use): Update. (glthread_recursive_lock_init_multithreaded): Update. (glthread_recursive_lock_lock_multithreaded): Update. (glthread_recursive_lock_unlock_multithreaded): Update. (glthread_recursive_lock_destroy_multithreaded): Update. (glthread_lock_init_func): Update. (glthread_lock_lock_func): Update. (glthread_lock_unlock_func): Update. (glthread_lock_destroy_func): Update. (glthread_rwlock_init_func): Update. (glthread_rwlock_rdlock_func): Update. (glthread_rwlock_wrlock_func): Update. (glthread_rwlock_unlock_func): Update. (glthread_rwlock_destroy_func): Update. (glthread_recursive_lock_init_func): Update. (glthread_recursive_lock_lock_func): Update. (glthread_recursive_lock_unlock_func): Update. (glthread_recursive_lock_destroy_func): Update. (glthread_once_func): Update. * import/glthread/threadlib.c: Update. * import/hard-locale.c: Update. * import/hard-locale.h: Update. * import/inet_ntop.c: Update. * import/intprops.h (__has_builtin): Update. (_GL_INT_CONVERT): Update. (_GL_INT_NEGATE_CONVERT): Update. (verify): Update. (_GL_HAS_BUILTIN_OVERFLOW): Update. (_GL_HAS_BUILTIN_ADD_OVERFLOW): Update. (_GL_HAS_BUILTIN_OVERFLOW_P): Update. (_GL_HAS_BUILTIN_MUL_OVERFLOW): Update. (_GL_BINARY_OP_OVERFLOW): Update. (INT_ADD_WRAPV): Update. (INT_SUBTRACT_WRAPV): Update. (INT_MULTIPLY_WRAPV): Update. (_GL_INT_OP_WRAPV): Update. (_GL_INT_OP_WRAPV_SMALLISH): Update. (_GL_INT_OP_WRAPV_LONGISH): Update. (_GL_INT_OP_CALC): Update. (_GL_INT_OP_CALC1): Update. (_GL_INT_OP_WRAPV_VIA_UNSIGNED): Update. (_GL_INT_ADD_RANGE_OVERFLOW): Update. (_GL_INT_SUBTRACT_RANGE_OVERFLOW): Update. (_GL_INT_MULTIPLY_RANGE_OVERFLOW): Update. * import/inttypes.in.h (if): Update. * import/isnan.c: Update. * import/isnand-nolibm.h: Update. * import/isnand.c: Update. * import/isnanl-nolibm.h: Update. * import/isnanl.c: Update. * import/itold.c: Update. * import/libc-config.h: New file. * import/limits.in.h (LLONG_MIN): Update. (LLONG_MAX): Update. (ULLONG_MAX): Update. (WORD_BIT): Update. (LONG_BIT): Update. * import/localcharset.c (setlocale): Update. (relocate): Update. (O_NOFOLLOW): Update. (ISSLASH): Update. (DIRECTORY_SEPARATOR): Update. (getc): Update. (volatile): Update. (get_charset_aliases): Update. (struct table_entry): Update. (alias_table_defined): Update. (locale_table_defined): Update. (locale_charset): Update. (if): Update. * import/localcharset.h: Update. * import/localtime-buffer.c: New file. * import/localtime-buffer.h: New file. * import/lstat.c (rpl_lstat): Update. * import/m4/00gnulib.m4: Update. * import/m4/__inline.m4: New file. * import/m4/absolute-header.m4: Update. * import/m4/alloca.m4: Update. * import/m4/arpa_inet_h.m4: Update. * import/m4/builtin-expect.m4: New file. * import/m4/canonicalize.m4: Update. * import/m4/chdir-long.m4: Update. * import/m4/close.m4: Update. * import/m4/closedir.m4: Update. * import/m4/codeset.m4: Update. * import/m4/configmake.m4: Remove. * import/m4/d-ino.m4: Update. * import/m4/d-type.m4: Update. * import/m4/dirent_h.m4: Update. * import/m4/dirfd.m4: Update. * import/m4/dirname.m4: Update. * import/m4/double-slash-root.m4: Update. * import/m4/dup.m4: Update. * import/m4/dup2.m4: Update. * import/m4/eealloc.m4: Update. * import/m4/environ.m4: Update. * import/m4/errno_h.m4: Update. * import/m4/error.m4: Update. * import/m4/exponentd.m4: Update. * import/m4/exponentl.m4: Update. * import/m4/extensions.m4: Update. * import/m4/extern-inline.m4: Update. * import/m4/fchdir.m4: Update. * import/m4/fcntl-o.m4: Update. * import/m4/fcntl.m4: Update. * import/m4/fcntl_h.m4: Update. * import/m4/fdopendir.m4: Update. * import/m4/filenamecat.m4: Update. * import/m4/flexmember.m4: Update. * import/m4/float_h.m4: Update. * import/m4/fnmatch.m4: Update. * import/m4/fnmatch_h.m4: New file. * import/m4/fpieee.m4: Update. * import/m4/frexp.m4: Update. * import/m4/frexpl.m4: Update. * import/m4/fstat.m4: Update. * import/m4/fstatat.m4: Update. * import/m4/getcwd-abort-bug.m4: Update. * import/m4/getcwd-path-max.m4: Update. * import/m4/getcwd.m4: Update. * import/m4/getdtablesize.m4: Update. * import/m4/getlogin.m4: New file. * import/m4/getlogin_r.m4: Update. * import/m4/getpagesize.m4: New file. * import/m4/getprogname.m4: Update. * import/m4/gettimeofday.m4: Update. * import/m4/glibc21.m4: Remove. * import/m4/glob.m4: Update. * import/m4/glob_h.m4: New file. * import/m4/gnulib-cache.m4: Update. * import/m4/gnulib-common.m4: Update. * import/m4/gnulib-comp.m4: Update. * import/m4/gnulib-tool.m4: Update. * import/m4/hard-locale.m4: Remove. * import/m4/host-cpu-c-abi.m4: New file. * import/m4/include_next.m4: Update. * import/m4/inet_ntop.m4: Update. * import/m4/inttypes-pri.m4: Update. * import/m4/inttypes.m4: Update. * import/m4/isnand.m4: Update. * import/m4/isnanl.m4: Update. * import/m4/largefile.m4: Update. * import/m4/lib-ld.m4: Update. * import/m4/lib-link.m4: Update. * import/m4/lib-prefix.m4: Update. * import/m4/limits-h.m4: Update. * import/m4/localcharset.m4: Update. * import/m4/locale-fr.m4: Update. * import/m4/locale-ja.m4: Update. * import/m4/locale-zh.m4: Update. * import/m4/localtime-buffer.m4: New file. * import/m4/lock.m4: Update. * import/m4/longlong.m4: Update. * import/m4/lstat.m4: Update. * import/m4/malloc.m4: Update. * import/m4/malloca.m4: Update. * import/m4/math_h.m4: Update. * import/m4/mbrtowc.m4: Update. * import/m4/mbsinit.m4: Update. * import/m4/mbsrtowcs.m4: Update. * import/m4/mbstate_t.m4: Update. * import/m4/memchr.m4: Update. * import/m4/memmem.m4: Update. * import/m4/mempcpy.m4: Update. * import/m4/memrchr.m4: Update. * import/m4/mkdir.m4: Update. * import/m4/mkdtemp.m4: Update. * import/m4/mkostemp.m4: Update. * import/m4/mmap-anon.m4: Update. * import/m4/mode_t.m4: Update. * import/m4/msvc-inval.m4: Update. * import/m4/msvc-nothrow.m4: Update. * import/m4/multiarch.m4: Update. * import/m4/netinet_in_h.m4: Update. * import/m4/nocrash.m4: Update. * import/m4/off_t.m4: Update. * import/m4/onceonly.m4: Remove. * import/m4/open-cloexec.m4: New file. * import/m4/open-slash.m4: New file. * import/m4/open.m4: Update. * import/m4/openat.m4: Update. * import/m4/opendir.m4: Update. * import/m4/pathmax.m4: Update. * import/m4/pthread_rwlock_rdlock.m4: New file. * import/m4/rawmemchr.m4: Update. * import/m4/readdir.m4: Update. * import/m4/readlink.m4: Update. * import/m4/realloc.m4: Update. * import/m4/rename.m4: Update. * import/m4/rewinddir.m4: Update. * import/m4/rmdir.m4: Update. * import/m4/save-cwd.m4: Update. * import/m4/secure_getenv.m4: Remove. * import/m4/setenv.m4: Update. * import/m4/signal_h.m4: Update. * import/m4/socklen.m4: Update. * import/m4/sockpfaf.m4: Update. * import/m4/ssize_t.m4: Update. * import/m4/stat-time.m4: New file. * import/m4/stat.m4: Update. * import/m4/std-gnu11.m4: New file. * import/m4/stdalign.m4: Update. * import/m4/stdbool.m4: Update. * import/m4/stddef_h.m4: Update. * import/m4/stdint.m4: Update. * import/m4/stdio_h.m4: Update. * import/m4/stdlib_h.m4: Update. * import/m4/strchrnul.m4: Update. * import/m4/strdup.m4: Update. * import/m4/strerror.m4: Update. * import/m4/strerror_r.m4: Update. * import/m4/string_h.m4: Update. * import/m4/strstr.m4: Update. * import/m4/strtok_r.m4: Update. * import/m4/sys_socket_h.m4: Update. * import/m4/sys_stat_h.m4: Update. * import/m4/sys_time_h.m4: Update. * import/m4/sys_types_h.m4: Update. * import/m4/sys_uio_h.m4: Update. * import/m4/tempname.m4: Update. * import/m4/threadlib.m4: Update. * import/m4/time_h.m4: Update. * import/m4/time_r.m4: Update. * import/m4/unistd-safer.m4: Update. * import/m4/unistd_h.m4: Update. * import/m4/warn-on-use.m4: Update. * import/m4/wchar_h.m4: Update. * import/m4/wchar_t.m4: Update. * import/m4/wctype_h.m4: Update. * import/m4/wint_t.m4: Update. * import/malloc.c: Update. * import/malloc/scratch_buffer.h: New file. * import/malloc/scratch_buffer_grow.c: New file. * import/malloc/scratch_buffer_grow_preserve.c: New file. * import/malloc/scratch_buffer_set_array_size.c: New file. * import/malloca.c (MAGIC_NUMBER): Update. (MAGIC_SIZE): Update. (struct preliminary_header): Update. (HEADER_SIZE): Update. (union header): Update. (verify): Update. (HASH_TABLE_SIZE): Update. (freea): Update. * import/malloca.h (malloca): Update. (nmalloca): Update. * import/malloca.valgrind: Remove. * import/math.in.h (_GL_MATH_CXX_REAL_FLOATING_DECL_2): Update. (func): Update. (rpl_func): Update. (f): Update. (d): Update. (l): Update. (_GL_WARN_ON_USE): Update. (_GL_WARN_ON_USE_ATTRIBUTE): Update. (FP_ILOGB0): Update. (FP_ILOGBNAN): Update. (acosf): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (asinf): Update. (atanf): Update. (atan2f): Update. (cosf): Update. (coshf): Update. (expf): Update. (expl): Update. (expm1l): Update. (ilogbl): Update. (rintl): Update. (sinf): Update. (sinhf): Update. (sqrtf): Update. (tanf): Update. (tanhf): Update. (isfinite): Update. (isinf): Update. (isnan): Update. (GNULIB_defined_signbit): Update. (signbit): Update. * import/mbrtowc.c (FALLTHROUGH): Update. (locale_enc): Update. (locale_enc_cached): Update. (gl_lock_define_initialized): Update. (mbrtowc): Update. * import/mbsinit.c (if): Update. (mbsinit): Update. * import/mbsrtowcs-impl.h: Update. * import/mbsrtowcs-state.c: Update. * import/mbsrtowcs.c: Update. * import/memchr.c: Update. * import/memchr.valgrind: Update. * import/memmem.c (__builtin_expect): Update. * import/mempcpy.c: Update. * import/memrchr.c (__memrchr): Update. * import/mkdir.c (if): Update. * import/mkdtemp.c: Update. * import/mkostemp.c: Update. * import/msvc-inval.c: Update. * import/msvc-inval.h: Update. * import/msvc-nothrow.c: Update. * import/msvc-nothrow.h (if): Update. * import/netinet_in.in.h: Update. * import/open.c (open): Update. (if): Update. * import/openat-die.c: Update. * import/openat-priv.h: Update. * import/openat-proc.c: Update. * import/openat.c (rpl_openat): Update. * import/openat.h: Update. * import/opendir.c: Update. * import/pathmax.h (if): Update. * import/pipe-safer.c: Update. * import/rawmemchr.c: Update. * import/rawmemchr.valgrind: Update. * import/readdir.c (readdir): Update. * import/readlink.c: Update. * import/realloc.c: Update. * import/ref-add.sin: Remove. * import/ref-del.sin: Remove. * import/rename.c (if): Update. * import/rewinddir.c: Update. * import/rmdir.c: Update. * import/same-inode.h (SAME_INODE): Update. * import/save-cwd.c (save_cwd): Update. * import/save-cwd.h: Update. * import/scratch_buffer.h: New file. * import/secure_getenv.c: Remove. * import/setenv.c: Update. * import/signal.in.h: Update. * import/stat-time.c: New file. * import/stat-time.h: New file. * import/stat-w32.c: New file. * import/stat-w32.h: New file. * import/stat.c (if): Update. (stat): Update. (REPLACE_FUNC_STAT_DIR): Update. (WINDOWS_NATIVE): Update. (WIN32_LEAN_AND_MEAN): Update. (is_unc_root): Update. (rpl_stat): Update. * import/stdalign.in.h (elif): Update. * import/stdbool.in.h: Update. * import/stddef.in.h (_GL_STDDEF_ALIGNAS): Update. (max_align_t): Update. (GNULIB_defined_max_align_t): Update. * import/stdint.in.h (WINT_MIN): Update. (WINT_MAX): Update. (_STDINT_MIN): Update. (_STDINT_UNSIGNED_MIN): Update. (_STDINT_SIGNED_MIN): Update. (PTRDIFF_MIN): Update. (SIG_ATOMIC_MIN): Update. (WCHAR_MIN): Update. * import/stdio.in.h (if): Update. * import/stdlib.in.h (if): Update. (_GL_WARN_ON_USE): Update. (_GL_FUNCDECL_SYS): Update. (random): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (srandom): Update. (initstate): Update. (setstate): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (GNULIB_defined_strtod_function): Update. (strtold): Update. (GNULIB_defined_strtold_function): Update. * import/str-two-way.h: Update. * import/strchrnul.c: Update. * import/strchrnul.valgrind: Update. * import/strdup.c: Update. * import/streq.h: Update. * import/strerror-override.c: Update. * import/strerror-override.h: Update. * import/strerror.c (strerror): Update. * import/strerror_r.c (safe_copy): Update. * import/string.in.h (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (_GL_WARN_ON_USE): Update. * import/stripslash.c: Update. * import/strnlen1.c: Update. * import/strnlen1.h: Update. * import/strstr.c (__builtin_expect): Update. * import/strtok_r.c: Update. * import/sys_socket.in.h (CMSG_SPACE): Update. (CMSG_LEN): Update. (struct sockaddr_storage): Update. (SO_REUSEPORT): Update. (_GL_WARN_ON_USE): Update. * import/sys_stat.in.h (if): Update. (stat): Update. (struct stat): Update. (st_atime): Update. (st_mtime): Update. (st_ctime): Update. (_GL_WINDOWS_STAT_TIMESPEC): Update. (GNULIB_defined_struct_stat): Update. (_S_IFBLK): Update. (_S_IFLNK): Update. (_S_IFSOCK): Update. (fstat): Update. (fstatat): Update. (lstat): Update. (stat64): Update. (_stat64): Update. (_stat32i64): Update. (_stati64): Update. (_stat32): Update. (_stat64i32): Update. * import/sys_time.in.h: Update. * import/sys_types.in.h (dev_t): Update. (GNULIB_defined_dev_t): Update. (ino_t): Update. (GNULIB_defined_ino_t): Update. (_GL_WINDOWS_STAT_INODES): Update. (if): Update. * import/sys_uio.in.h: Update. * import/tempname.c (__secure_getenv): Update. (try_nocreate): Update. * import/tempname.h: Update. * import/time.in.h (tzset): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (ctime): Update. (strftime): Update. * import/time_r.c: Update. * import/unistd--.h: Update. * import/unistd-safer.h: Update. * import/unistd.in.h (if): Update. (elif): Update. (__need_getopt): Update. (access): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (_GL_WARN_ON_USE): Update. (_GL_FUNCDECL_SYS): Update. (__declspec): Update. (_GL_WARN_ON_USE_ATTRIBUTE): Update. (faccessat): Update. (getpass): Update. (truncate): Update. * import/unsetenv.c: Update. * import/verify.h (if): Update. (_GL_HAVE__STATIC_ASSERT): Update. (_GL_HAVE_STATIC_ASSERT): Update. (_GL_HAVE__STATIC_ASSERT1): Update. (_GL_HAVE_STATIC_ASSERT1): Update. (_GL_VERIFY): Update. (_Static_assert): Update. (_GL_HAS_BUILTIN_TRAP): Update. (_GL_HAS_BUILTIN_UNREACHABLE): Update. (verify_true): Update. (verify): Update. (__has_builtin): Update. (elif): Update. (assume): Update. * import/warn-on-use.h: Rename from import/extra/snippet/warn-on-use.h. * import/wchar.in.h (if): Update. (wcsftime): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (_GL_WARN_ON_USE): Update. * import/wctype.in.h (rpl_iswalnum): Update. (rpl_iswalpha): Update. (rpl_iswblank): Update. (rpl_iswcntrl): Update. (rpl_iswdigit): Update. (rpl_iswgraph): Update. (rpl_iswlower): Update. (rpl_iswprint): Update. (rpl_iswpunct): Update. (rpl_iswspace): Update. (rpl_iswupper): Update. (rpl_iswxdigit): Update. (rpl_towlower): Update. (rpl_towupper): Update. (iswalnum): Update. (iswalpha): Update. (iswblank): Update. (iswcntrl): Update. (iswdigit): Update. (iswgraph): Update. (iswlower): Update. (iswprint): Update. (iswpunct): Update. (iswspace): Update. (iswupper): Update. (iswxdigit): Update. (towlower): Update. (towupper): Update. * import/windows-initguard.h: New file. * import/windows-mutex.c: New file. * import/windows-mutex.h: New file. * import/windows-once.c: New file. * import/windows-once.h: New file. * import/windows-recmutex.c: New file. * import/windows-recmutex.h: New file. * import/windows-rwlock.c: New file. * import/windows-rwlock.h: New file. * import/xalloc-oversized.h: New file. * patches/0001-Fix-PR-gdb-23558-Use-system-s-getcwd-when-cross-comp.patch: Remove. * patches/0002-mkostemp-mkostemps-Fix-compilation-error-in-C-mode-o.patch: Remove. * patches/0003-Fix-glob-c-Coverity-issues.patch: Remove. * update-gnulib.sh: Update to latest gnulib and don't apply patches anymore. Also updates the patch -p flag to the current directory structure in case patches are needed again in the future. Change-Id: I9c2b07a3046baecfb664e21b2644353ea888dbfa
722 lines
23 KiB
C
722 lines
23 KiB
C
/* Provide a sys/socket header file for systems lacking it (read: MinGW)
|
|
and for systems where it is incomplete.
|
|
Copyright (C) 2005-2019 Free Software Foundation, Inc.
|
|
Written by Simon Josefsson.
|
|
|
|
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 <https://www.gnu.org/licenses/>. */
|
|
|
|
/* This file is supposed to be used on platforms that lack <sys/socket.h>,
|
|
on platforms where <sys/socket.h> cannot be included standalone, and on
|
|
platforms where <sys/socket.h> does not provide all necessary definitions.
|
|
It is intended to provide definitions and prototypes needed by an
|
|
application. */
|
|
|
|
#if __GNUC__ >= 3
|
|
@PRAGMA_SYSTEM_HEADER@
|
|
#endif
|
|
@PRAGMA_COLUMNS@
|
|
|
|
#if defined _GL_ALREADY_INCLUDING_SYS_SOCKET_H
|
|
/* Special invocation convention:
|
|
- On Cygwin 1.5.x we have a sequence of nested includes
|
|
<sys/socket.h> -> <cygwin/socket.h> -> <asm/socket.h> -> <cygwin/if.h>,
|
|
and the latter includes <sys/socket.h>. In this situation, the functions
|
|
are not yet declared, therefore we cannot provide the C++ aliases. */
|
|
|
|
#@INCLUDE_NEXT@ @NEXT_SYS_SOCKET_H@
|
|
|
|
#else
|
|
/* Normal invocation convention. */
|
|
|
|
#ifndef _@GUARD_PREFIX@_SYS_SOCKET_H
|
|
|
|
#if @HAVE_SYS_SOCKET_H@
|
|
|
|
# define _GL_ALREADY_INCLUDING_SYS_SOCKET_H
|
|
|
|
/* On many platforms, <sys/socket.h> assumes prior inclusion of
|
|
<sys/types.h>. */
|
|
# include <sys/types.h>
|
|
|
|
/* On FreeBSD 6.4, <sys/socket.h> defines some macros that assume that NULL
|
|
is defined. */
|
|
# include <stddef.h>
|
|
|
|
/* The include_next requires a split double-inclusion guard. */
|
|
# @INCLUDE_NEXT@ @NEXT_SYS_SOCKET_H@
|
|
|
|
# undef _GL_ALREADY_INCLUDING_SYS_SOCKET_H
|
|
|
|
#endif
|
|
|
|
#ifndef _@GUARD_PREFIX@_SYS_SOCKET_H
|
|
#define _@GUARD_PREFIX@_SYS_SOCKET_H
|
|
|
|
#ifndef _GL_INLINE_HEADER_BEGIN
|
|
#error "Please include config.h first."
|
|
#endif
|
|
_GL_INLINE_HEADER_BEGIN
|
|
#ifndef _GL_SYS_SOCKET_INLINE
|
|
# define _GL_SYS_SOCKET_INLINE _GL_INLINE
|
|
#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. */
|
|
|
|
#if !@HAVE_SA_FAMILY_T@
|
|
# if !GNULIB_defined_sa_family_t
|
|
/* On OS/2 kLIBC, sa_family_t is unsigned char unless TCPV40HDRS is defined. */
|
|
# if !defined __KLIBC__ || defined TCPV40HDRS
|
|
typedef unsigned short sa_family_t;
|
|
# else
|
|
typedef unsigned char sa_family_t;
|
|
# endif
|
|
# define GNULIB_defined_sa_family_t 1
|
|
# endif
|
|
#endif
|
|
|
|
#if @HAVE_STRUCT_SOCKADDR_STORAGE@
|
|
/* Make the 'struct sockaddr_storage' field 'ss_family' visible on AIX 7.1. */
|
|
# if !@HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY@
|
|
# ifndef ss_family
|
|
# define ss_family __ss_family
|
|
# endif
|
|
# endif
|
|
#else
|
|
# include <stdalign.h>
|
|
/* Code taken from glibc sysdeps/unix/sysv/linux/bits/socket.h on
|
|
2009-05-08, licensed under LGPLv2.1+, plus portability fixes. */
|
|
# define __ss_aligntype unsigned long int
|
|
# define _SS_SIZE 256
|
|
# define _SS_PADSIZE \
|
|
(_SS_SIZE - ((sizeof (sa_family_t) >= alignof (__ss_aligntype) \
|
|
? sizeof (sa_family_t) \
|
|
: alignof (__ss_aligntype)) \
|
|
+ sizeof (__ss_aligntype)))
|
|
|
|
# if !GNULIB_defined_struct_sockaddr_storage
|
|
struct sockaddr_storage
|
|
{
|
|
sa_family_t ss_family; /* Address family, etc. */
|
|
__ss_aligntype __ss_align; /* Force desired alignment. */
|
|
char __ss_padding[_SS_PADSIZE];
|
|
};
|
|
# define GNULIB_defined_struct_sockaddr_storage 1
|
|
# endif
|
|
|
|
#endif
|
|
|
|
/* Get struct iovec. */
|
|
/* But avoid namespace pollution on glibc systems. */
|
|
#if ! defined __GLIBC__
|
|
# include <sys/uio.h>
|
|
#endif
|
|
|
|
#if @HAVE_SYS_SOCKET_H@
|
|
|
|
/* A platform that has <sys/socket.h>. */
|
|
|
|
/* For shutdown(). */
|
|
# if !defined SHUT_RD
|
|
# define SHUT_RD 0
|
|
# endif
|
|
# if !defined SHUT_WR
|
|
# define SHUT_WR 1
|
|
# endif
|
|
# if !defined SHUT_RDWR
|
|
# define SHUT_RDWR 2
|
|
# endif
|
|
|
|
# ifdef __VMS /* OpenVMS */
|
|
# ifndef CMSG_SPACE
|
|
# define CMSG_SPACE(length) _CMSG_SPACE(length)
|
|
# endif
|
|
# ifndef CMSG_LEN
|
|
# define CMSG_LEN(length) _CMSG_LEN(length)
|
|
# endif
|
|
# endif
|
|
|
|
#else
|
|
|
|
# ifdef __CYGWIN__
|
|
# error "Cygwin does have a sys/socket.h, doesn't it?!?"
|
|
# endif
|
|
|
|
/* A platform that lacks <sys/socket.h>.
|
|
|
|
Currently only MinGW is supported. See the gnulib manual regarding
|
|
Windows sockets. MinGW has the header files winsock2.h and
|
|
ws2tcpip.h that declare the sys/socket.h definitions we need. Note
|
|
that you can influence which definitions you get by setting the
|
|
WINVER symbol before including these two files. For example,
|
|
getaddrinfo is only available if _WIN32_WINNT >= 0x0501 (that
|
|
symbol is set indirectly through WINVER). You can set this by
|
|
adding AC_DEFINE(WINVER, 0x0501) to configure.ac. Note that your
|
|
code may not run on older Windows releases then. My Windows 2000
|
|
box was not able to run the code, for example. The situation is
|
|
slightly confusing because
|
|
<https://docs.microsoft.com/en-us/windows/desktop/api/ws2tcpip/nf-ws2tcpip-getaddrinfo>
|
|
suggests that getaddrinfo should be available on all Windows
|
|
releases. */
|
|
|
|
# if @HAVE_WINSOCK2_H@
|
|
# include <winsock2.h>
|
|
# endif
|
|
# if @HAVE_WS2TCPIP_H@
|
|
# include <ws2tcpip.h>
|
|
# endif
|
|
|
|
/* For shutdown(). */
|
|
# if !defined SHUT_RD && defined SD_RECEIVE
|
|
# define SHUT_RD SD_RECEIVE
|
|
# endif
|
|
# if !defined SHUT_WR && defined SD_SEND
|
|
# define SHUT_WR SD_SEND
|
|
# endif
|
|
# if !defined SHUT_RDWR && defined SD_BOTH
|
|
# define SHUT_RDWR SD_BOTH
|
|
# endif
|
|
|
|
# if @HAVE_WINSOCK2_H@
|
|
/* Include headers needed by the emulation code. */
|
|
# include <sys/types.h>
|
|
# include <io.h>
|
|
|
|
# if !GNULIB_defined_socklen_t
|
|
typedef int socklen_t;
|
|
# define GNULIB_defined_socklen_t 1
|
|
# endif
|
|
|
|
# endif
|
|
|
|
/* Rudimentary 'struct msghdr'; this works as long as you don't try to
|
|
access msg_control or msg_controllen. */
|
|
struct msghdr {
|
|
void *msg_name;
|
|
socklen_t msg_namelen;
|
|
struct iovec *msg_iov;
|
|
int msg_iovlen;
|
|
int msg_flags;
|
|
};
|
|
|
|
#endif
|
|
|
|
/* Ensure SO_REUSEPORT is defined. */
|
|
/* For the subtle differences between SO_REUSEPORT and SO_REUSEADDR, see
|
|
https://stackoverflow.com/questions/14388706/socket-options-so-reuseaddr-and-so-reuseport-how-do-they-differ-do-they-mean-t
|
|
and https://lwn.net/Articles/542629/
|
|
*/
|
|
#ifndef SO_REUSEPORT
|
|
# define SO_REUSEPORT SO_REUSEADDR
|
|
#endif
|
|
|
|
/* 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. */
|
|
_GL_SYS_SOCKET_INLINE 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
|
|
# 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_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
|
|
|
|
/* Wrap everything else to use libc file descriptors for sockets. */
|
|
|
|
#if @GNULIB_SOCKET@
|
|
# if @HAVE_WINSOCK2_H@
|
|
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
# undef socket
|
|
# define socket rpl_socket
|
|
# endif
|
|
_GL_FUNCDECL_RPL (socket, int, (int domain, int type, int protocol));
|
|
_GL_CXXALIAS_RPL (socket, int, (int domain, int type, int protocol));
|
|
# else
|
|
_GL_CXXALIAS_SYS (socket, int, (int domain, int type, int protocol));
|
|
# endif
|
|
_GL_CXXALIASWARN (socket);
|
|
#elif @HAVE_WINSOCK2_H@
|
|
# undef socket
|
|
# define socket socket_used_without_requesting_gnulib_module_socket
|
|
#elif defined GNULIB_POSIXCHECK
|
|
# undef socket
|
|
# if HAVE_RAW_DECL_SOCKET
|
|
_GL_WARN_ON_USE (socket, "socket is not always POSIX compliant - "
|
|
"use gnulib module socket for portability");
|
|
# endif
|
|
#endif
|
|
|
|
#if @GNULIB_CONNECT@
|
|
# if @HAVE_WINSOCK2_H@
|
|
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
# undef connect
|
|
# define connect rpl_connect
|
|
# endif
|
|
_GL_FUNCDECL_RPL (connect, int,
|
|
(int fd, const struct sockaddr *addr, socklen_t addrlen)
|
|
_GL_ARG_NONNULL ((2)));
|
|
_GL_CXXALIAS_RPL (connect, int,
|
|
(int fd, const struct sockaddr *addr, socklen_t addrlen));
|
|
# else
|
|
/* Need to cast, because on NonStop Kernel, the third parameter is
|
|
size_t addrlen. */
|
|
_GL_CXXALIAS_SYS_CAST (connect, int,
|
|
(int fd,
|
|
const struct sockaddr *addr, socklen_t addrlen));
|
|
# endif
|
|
_GL_CXXALIASWARN (connect);
|
|
#elif @HAVE_WINSOCK2_H@
|
|
# undef connect
|
|
# define connect socket_used_without_requesting_gnulib_module_connect
|
|
#elif defined GNULIB_POSIXCHECK
|
|
# undef connect
|
|
# if HAVE_RAW_DECL_CONNECT
|
|
_GL_WARN_ON_USE (connect, "connect is not always POSIX compliant - "
|
|
"use gnulib module connect for portability");
|
|
# endif
|
|
#endif
|
|
|
|
#if @GNULIB_ACCEPT@
|
|
# if @HAVE_WINSOCK2_H@
|
|
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
# undef accept
|
|
# define accept rpl_accept
|
|
# endif
|
|
_GL_FUNCDECL_RPL (accept, int,
|
|
(int fd, struct sockaddr *addr, socklen_t *addrlen));
|
|
_GL_CXXALIAS_RPL (accept, int,
|
|
(int fd, struct sockaddr *addr, socklen_t *addrlen));
|
|
# else
|
|
/* Need to cast, because on Solaris 10 systems, the third parameter is
|
|
void *addrlen. */
|
|
_GL_CXXALIAS_SYS_CAST (accept, int,
|
|
(int fd, struct sockaddr *addr, socklen_t *addrlen));
|
|
# endif
|
|
_GL_CXXALIASWARN (accept);
|
|
#elif @HAVE_WINSOCK2_H@
|
|
# undef accept
|
|
# define accept accept_used_without_requesting_gnulib_module_accept
|
|
#elif defined GNULIB_POSIXCHECK
|
|
# undef accept
|
|
# if HAVE_RAW_DECL_ACCEPT
|
|
_GL_WARN_ON_USE (accept, "accept is not always POSIX compliant - "
|
|
"use gnulib module accept for portability");
|
|
# endif
|
|
#endif
|
|
|
|
#if @GNULIB_BIND@
|
|
# if @HAVE_WINSOCK2_H@
|
|
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
# undef bind
|
|
# define bind rpl_bind
|
|
# endif
|
|
_GL_FUNCDECL_RPL (bind, int,
|
|
(int fd, const struct sockaddr *addr, socklen_t addrlen)
|
|
_GL_ARG_NONNULL ((2)));
|
|
_GL_CXXALIAS_RPL (bind, int,
|
|
(int fd, const struct sockaddr *addr, socklen_t addrlen));
|
|
# else
|
|
/* Need to cast, because on NonStop Kernel, the third parameter is
|
|
size_t addrlen. */
|
|
_GL_CXXALIAS_SYS_CAST (bind, int,
|
|
(int fd,
|
|
const struct sockaddr *addr, socklen_t addrlen));
|
|
# endif
|
|
_GL_CXXALIASWARN (bind);
|
|
#elif @HAVE_WINSOCK2_H@
|
|
# undef bind
|
|
# define bind bind_used_without_requesting_gnulib_module_bind
|
|
#elif defined GNULIB_POSIXCHECK
|
|
# undef bind
|
|
# if HAVE_RAW_DECL_BIND
|
|
_GL_WARN_ON_USE (bind, "bind is not always POSIX compliant - "
|
|
"use gnulib module bind for portability");
|
|
# endif
|
|
#endif
|
|
|
|
#if @GNULIB_GETPEERNAME@
|
|
# if @HAVE_WINSOCK2_H@
|
|
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
# undef getpeername
|
|
# define getpeername rpl_getpeername
|
|
# endif
|
|
_GL_FUNCDECL_RPL (getpeername, int,
|
|
(int fd, struct sockaddr *addr, socklen_t *addrlen)
|
|
_GL_ARG_NONNULL ((2, 3)));
|
|
_GL_CXXALIAS_RPL (getpeername, int,
|
|
(int fd, struct sockaddr *addr, socklen_t *addrlen));
|
|
# else
|
|
/* Need to cast, because on Solaris 10 systems, the third parameter is
|
|
void *addrlen. */
|
|
_GL_CXXALIAS_SYS_CAST (getpeername, int,
|
|
(int fd, struct sockaddr *addr, socklen_t *addrlen));
|
|
# endif
|
|
_GL_CXXALIASWARN (getpeername);
|
|
#elif @HAVE_WINSOCK2_H@
|
|
# undef getpeername
|
|
# define getpeername getpeername_used_without_requesting_gnulib_module_getpeername
|
|
#elif defined GNULIB_POSIXCHECK
|
|
# undef getpeername
|
|
# if HAVE_RAW_DECL_GETPEERNAME
|
|
_GL_WARN_ON_USE (getpeername, "getpeername is not always POSIX compliant - "
|
|
"use gnulib module getpeername for portability");
|
|
# endif
|
|
#endif
|
|
|
|
#if @GNULIB_GETSOCKNAME@
|
|
# if @HAVE_WINSOCK2_H@
|
|
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
# undef getsockname
|
|
# define getsockname rpl_getsockname
|
|
# endif
|
|
_GL_FUNCDECL_RPL (getsockname, int,
|
|
(int fd, struct sockaddr *addr, socklen_t *addrlen)
|
|
_GL_ARG_NONNULL ((2, 3)));
|
|
_GL_CXXALIAS_RPL (getsockname, int,
|
|
(int fd, struct sockaddr *addr, socklen_t *addrlen));
|
|
# else
|
|
/* Need to cast, because on Solaris 10 systems, the third parameter is
|
|
void *addrlen. */
|
|
_GL_CXXALIAS_SYS_CAST (getsockname, int,
|
|
(int fd, struct sockaddr *addr, socklen_t *addrlen));
|
|
# endif
|
|
_GL_CXXALIASWARN (getsockname);
|
|
#elif @HAVE_WINSOCK2_H@
|
|
# undef getsockname
|
|
# define getsockname getsockname_used_without_requesting_gnulib_module_getsockname
|
|
#elif defined GNULIB_POSIXCHECK
|
|
# undef getsockname
|
|
# if HAVE_RAW_DECL_GETSOCKNAME
|
|
_GL_WARN_ON_USE (getsockname, "getsockname is not always POSIX compliant - "
|
|
"use gnulib module getsockname for portability");
|
|
# endif
|
|
#endif
|
|
|
|
#if @GNULIB_GETSOCKOPT@
|
|
# if @HAVE_WINSOCK2_H@
|
|
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
# undef getsockopt
|
|
# define getsockopt rpl_getsockopt
|
|
# endif
|
|
_GL_FUNCDECL_RPL (getsockopt, int, (int fd, int level, int optname,
|
|
void *optval, socklen_t *optlen)
|
|
_GL_ARG_NONNULL ((4, 5)));
|
|
_GL_CXXALIAS_RPL (getsockopt, int, (int fd, int level, int optname,
|
|
void *optval, socklen_t *optlen));
|
|
# else
|
|
/* Need to cast, because on Solaris 10 systems, the fifth parameter is
|
|
void *optlen. */
|
|
_GL_CXXALIAS_SYS_CAST (getsockopt, int, (int fd, int level, int optname,
|
|
void *optval, socklen_t *optlen));
|
|
# endif
|
|
_GL_CXXALIASWARN (getsockopt);
|
|
#elif @HAVE_WINSOCK2_H@
|
|
# undef getsockopt
|
|
# define getsockopt getsockopt_used_without_requesting_gnulib_module_getsockopt
|
|
#elif defined GNULIB_POSIXCHECK
|
|
# undef getsockopt
|
|
# if HAVE_RAW_DECL_GETSOCKOPT
|
|
_GL_WARN_ON_USE (getsockopt, "getsockopt is not always POSIX compliant - "
|
|
"use gnulib module getsockopt for portability");
|
|
# endif
|
|
#endif
|
|
|
|
#if @GNULIB_LISTEN@
|
|
# if @HAVE_WINSOCK2_H@
|
|
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
# undef listen
|
|
# define listen rpl_listen
|
|
# endif
|
|
_GL_FUNCDECL_RPL (listen, int, (int fd, int backlog));
|
|
_GL_CXXALIAS_RPL (listen, int, (int fd, int backlog));
|
|
# else
|
|
_GL_CXXALIAS_SYS (listen, int, (int fd, int backlog));
|
|
# endif
|
|
_GL_CXXALIASWARN (listen);
|
|
#elif @HAVE_WINSOCK2_H@
|
|
# undef listen
|
|
# define listen listen_used_without_requesting_gnulib_module_listen
|
|
#elif defined GNULIB_POSIXCHECK
|
|
# undef listen
|
|
# if HAVE_RAW_DECL_LISTEN
|
|
_GL_WARN_ON_USE (listen, "listen is not always POSIX compliant - "
|
|
"use gnulib module listen for portability");
|
|
# endif
|
|
#endif
|
|
|
|
#if @GNULIB_RECV@
|
|
# if @HAVE_WINSOCK2_H@
|
|
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
# undef recv
|
|
# define recv rpl_recv
|
|
# endif
|
|
_GL_FUNCDECL_RPL (recv, ssize_t, (int fd, void *buf, size_t len, int flags)
|
|
_GL_ARG_NONNULL ((2)));
|
|
_GL_CXXALIAS_RPL (recv, ssize_t, (int fd, void *buf, size_t len, int flags));
|
|
# else
|
|
/* Need to cast, because on HP-UX 11.31 the return type may be
|
|
int,
|
|
depending on compiler options. */
|
|
_GL_CXXALIAS_SYS_CAST (recv, ssize_t, (int fd, void *buf, size_t len, int flags));
|
|
# endif
|
|
_GL_CXXALIASWARN (recv);
|
|
#elif @HAVE_WINSOCK2_H@
|
|
# undef recv
|
|
# define recv recv_used_without_requesting_gnulib_module_recv
|
|
#elif defined GNULIB_POSIXCHECK
|
|
# undef recv
|
|
# if HAVE_RAW_DECL_RECV
|
|
_GL_WARN_ON_USE (recv, "recv is not always POSIX compliant - "
|
|
"use gnulib module recv for portability");
|
|
# endif
|
|
#endif
|
|
|
|
#if @GNULIB_SEND@
|
|
# if @HAVE_WINSOCK2_H@
|
|
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
# undef send
|
|
# define send rpl_send
|
|
# endif
|
|
_GL_FUNCDECL_RPL (send, ssize_t,
|
|
(int fd, const void *buf, size_t len, int flags)
|
|
_GL_ARG_NONNULL ((2)));
|
|
_GL_CXXALIAS_RPL (send, ssize_t,
|
|
(int fd, const void *buf, size_t len, int flags));
|
|
# else
|
|
/* Need to cast, because on HP-UX 11.31 the return type may be
|
|
int,
|
|
depending on compiler options. */
|
|
_GL_CXXALIAS_SYS_CAST (send, ssize_t,
|
|
(int fd, const void *buf, size_t len, int flags));
|
|
# endif
|
|
_GL_CXXALIASWARN (send);
|
|
#elif @HAVE_WINSOCK2_H@
|
|
# undef send
|
|
# define send send_used_without_requesting_gnulib_module_send
|
|
#elif defined GNULIB_POSIXCHECK
|
|
# undef send
|
|
# if HAVE_RAW_DECL_SEND
|
|
_GL_WARN_ON_USE (send, "send is not always POSIX compliant - "
|
|
"use gnulib module send for portability");
|
|
# endif
|
|
#endif
|
|
|
|
#if @GNULIB_RECVFROM@
|
|
# if @HAVE_WINSOCK2_H@
|
|
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
# undef recvfrom
|
|
# define recvfrom rpl_recvfrom
|
|
# endif
|
|
_GL_FUNCDECL_RPL (recvfrom, ssize_t,
|
|
(int fd, void *buf, size_t len, int flags,
|
|
struct sockaddr *from, socklen_t *fromlen)
|
|
_GL_ARG_NONNULL ((2)));
|
|
_GL_CXXALIAS_RPL (recvfrom, ssize_t,
|
|
(int fd, void *buf, size_t len, int flags,
|
|
struct sockaddr *from, socklen_t *fromlen));
|
|
# else
|
|
/* Need to cast, because on Solaris 10 systems, the sixth parameter is
|
|
void *fromlen. */
|
|
_GL_CXXALIAS_SYS_CAST (recvfrom, ssize_t,
|
|
(int fd, void *buf, size_t len, int flags,
|
|
struct sockaddr *from, socklen_t *fromlen));
|
|
# endif
|
|
_GL_CXXALIASWARN (recvfrom);
|
|
#elif @HAVE_WINSOCK2_H@
|
|
# undef recvfrom
|
|
# define recvfrom recvfrom_used_without_requesting_gnulib_module_recvfrom
|
|
#elif defined GNULIB_POSIXCHECK
|
|
# undef recvfrom
|
|
# if HAVE_RAW_DECL_RECVFROM
|
|
_GL_WARN_ON_USE (recvfrom, "recvfrom is not always POSIX compliant - "
|
|
"use gnulib module recvfrom for portability");
|
|
# endif
|
|
#endif
|
|
|
|
#if @GNULIB_SENDTO@
|
|
# if @HAVE_WINSOCK2_H@
|
|
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
# undef sendto
|
|
# define sendto rpl_sendto
|
|
# endif
|
|
_GL_FUNCDECL_RPL (sendto, ssize_t,
|
|
(int fd, const void *buf, size_t len, int flags,
|
|
const struct sockaddr *to, socklen_t tolen)
|
|
_GL_ARG_NONNULL ((2)));
|
|
_GL_CXXALIAS_RPL (sendto, ssize_t,
|
|
(int fd, const void *buf, size_t len, int flags,
|
|
const struct sockaddr *to, socklen_t tolen));
|
|
# else
|
|
/* Need to cast, because on NonStop Kernel, the sixth parameter is
|
|
size_t tolen. */
|
|
_GL_CXXALIAS_SYS_CAST (sendto, ssize_t,
|
|
(int fd, const void *buf, size_t len, int flags,
|
|
const struct sockaddr *to, socklen_t tolen));
|
|
# endif
|
|
_GL_CXXALIASWARN (sendto);
|
|
#elif @HAVE_WINSOCK2_H@
|
|
# undef sendto
|
|
# define sendto sendto_used_without_requesting_gnulib_module_sendto
|
|
#elif defined GNULIB_POSIXCHECK
|
|
# undef sendto
|
|
# if HAVE_RAW_DECL_SENDTO
|
|
_GL_WARN_ON_USE (sendto, "sendto is not always POSIX compliant - "
|
|
"use gnulib module sendto for portability");
|
|
# endif
|
|
#endif
|
|
|
|
#if @GNULIB_SETSOCKOPT@
|
|
# if @HAVE_WINSOCK2_H@
|
|
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
# undef setsockopt
|
|
# define setsockopt rpl_setsockopt
|
|
# endif
|
|
_GL_FUNCDECL_RPL (setsockopt, int, (int fd, int level, int optname,
|
|
const void * optval, socklen_t optlen)
|
|
_GL_ARG_NONNULL ((4)));
|
|
_GL_CXXALIAS_RPL (setsockopt, int, (int fd, int level, int optname,
|
|
const void * optval, socklen_t optlen));
|
|
# else
|
|
/* Need to cast, because on NonStop Kernel, the fifth parameter is
|
|
size_t optlen. */
|
|
_GL_CXXALIAS_SYS_CAST (setsockopt, int,
|
|
(int fd, int level, int optname,
|
|
const void * optval, socklen_t optlen));
|
|
# endif
|
|
_GL_CXXALIASWARN (setsockopt);
|
|
#elif @HAVE_WINSOCK2_H@
|
|
# undef setsockopt
|
|
# define setsockopt setsockopt_used_without_requesting_gnulib_module_setsockopt
|
|
#elif defined GNULIB_POSIXCHECK
|
|
# undef setsockopt
|
|
# if HAVE_RAW_DECL_SETSOCKOPT
|
|
_GL_WARN_ON_USE (setsockopt, "setsockopt is not always POSIX compliant - "
|
|
"use gnulib module setsockopt for portability");
|
|
# endif
|
|
#endif
|
|
|
|
#if @GNULIB_SHUTDOWN@
|
|
# if @HAVE_WINSOCK2_H@
|
|
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
# undef shutdown
|
|
# define shutdown rpl_shutdown
|
|
# endif
|
|
_GL_FUNCDECL_RPL (shutdown, int, (int fd, int how));
|
|
_GL_CXXALIAS_RPL (shutdown, int, (int fd, int how));
|
|
# else
|
|
_GL_CXXALIAS_SYS (shutdown, int, (int fd, int how));
|
|
# endif
|
|
_GL_CXXALIASWARN (shutdown);
|
|
#elif @HAVE_WINSOCK2_H@
|
|
# undef shutdown
|
|
# define shutdown shutdown_used_without_requesting_gnulib_module_shutdown
|
|
#elif defined GNULIB_POSIXCHECK
|
|
# undef shutdown
|
|
# if HAVE_RAW_DECL_SHUTDOWN
|
|
_GL_WARN_ON_USE (shutdown, "shutdown is not always POSIX compliant - "
|
|
"use gnulib module shutdown for portability");
|
|
# endif
|
|
#endif
|
|
|
|
#if @GNULIB_ACCEPT4@
|
|
/* Accept a connection on a socket, with specific opening flags.
|
|
The flags are a bitmask, possibly including O_CLOEXEC (defined in <fcntl.h>)
|
|
and O_TEXT, O_BINARY (defined in "binary-io.h").
|
|
See also the Linux man page at
|
|
<https://www.kernel.org/doc/man-pages/online/pages/man2/accept4.2.html>. */
|
|
# if @HAVE_ACCEPT4@
|
|
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
|
# define accept4 rpl_accept4
|
|
# endif
|
|
_GL_FUNCDECL_RPL (accept4, int,
|
|
(int sockfd, struct sockaddr *addr, socklen_t *addrlen,
|
|
int flags));
|
|
_GL_CXXALIAS_RPL (accept4, int,
|
|
(int sockfd, struct sockaddr *addr, socklen_t *addrlen,
|
|
int flags));
|
|
# else
|
|
_GL_FUNCDECL_SYS (accept4, int,
|
|
(int sockfd, struct sockaddr *addr, socklen_t *addrlen,
|
|
int flags));
|
|
_GL_CXXALIAS_SYS (accept4, int,
|
|
(int sockfd, struct sockaddr *addr, socklen_t *addrlen,
|
|
int flags));
|
|
# endif
|
|
_GL_CXXALIASWARN (accept4);
|
|
#elif defined GNULIB_POSIXCHECK
|
|
# undef accept4
|
|
# if HAVE_RAW_DECL_ACCEPT4
|
|
_GL_WARN_ON_USE (accept4, "accept4 is unportable - "
|
|
"use gnulib module accept4 for portability");
|
|
# endif
|
|
#endif
|
|
|
|
_GL_INLINE_HEADER_END
|
|
|
|
#endif /* _@GUARD_PREFIX@_SYS_SOCKET_H */
|
|
#endif /* _@GUARD_PREFIX@_SYS_SOCKET_H */
|
|
#endif
|