From 2a99a564a4cbc77ec02982a9ae72cfc2c93e811b Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 27 Dec 2024 23:41:53 +0100 Subject: [PATCH] Rename module unistd to unistd-h. * modules/unistd-h: Renamed from modules/unistd. * modules/unistd-h-tests: Renamed from modules/unistd-tests. * modules/unistd-h-c++-tests: Renamed from modules/unistd-c++-tests. * tests/test-unistd-h.c: Renamed from tests/test-unistd.c. * tests/test-unistd-h-c++.cc: Renamed from tests/test-unistd-c++.cc. * doc/posix-headers/unistd.texi: Update. * doc/posix-functions/_exit.texi: Update. * modules/* (Depends-on): Update. * modules/unistd: New file. --- ChangeLog | 13 + doc/posix-functions/_exit.texi | 4 +- doc/posix-headers/unistd.texi | 4 +- modules/_Exit | 2 +- modules/access | 2 +- modules/acl-tests | 2 +- modules/areadlink-with-size | 2 +- modules/areadlinkat-with-size | 2 +- modules/at-internal | 2 +- modules/atexit-tests | 2 +- modules/c-stack | 2 +- modules/canonicalize | 2 +- modules/canonicalize-lgpl | 2 +- modules/careadlinkat | 2 +- modules/chdir | 2 +- modules/chdir-long | 2 +- modules/chown | 2 +- modules/clean-temp | 2 +- modules/clean-temp-simple | 2 +- modules/close | 2 +- modules/closein | 2 +- modules/closeout | 2 +- modules/copy-file | 2 +- modules/copy-file-range | 2 +- modules/dfa-tests | 2 +- modules/dup | 2 +- modules/dup2 | 2 +- modules/dup3 | 2 +- modules/eloop-threshold | 2 +- modules/environ | 2 +- modules/error | 2 +- modules/euidaccess | 2 +- modules/execl | 2 +- modules/execle | 2 +- modules/execlp | 2 +- modules/execute | 2 +- modules/execute-tests | 2 +- modules/execv | 2 +- modules/execve | 2 +- modules/execvp | 2 +- modules/execvpe | 2 +- modules/faccessat | 2 +- modules/fatal-signal | 2 +- modules/fchdir | 2 +- modules/fchmodat | 2 +- modules/fchownat | 2 +- modules/fcntl-h | 2 +- modules/fd-hook | 2 +- modules/fdatasync | 2 +- modules/fflush | 2 +- modules/fgetc-tests | 2 +- modules/file-has-acl-tests | 2 +- modules/filemode-tests | 2 +- modules/findprog | 2 +- modules/findprog-in | 2 +- modules/findprog-lgpl | 2 +- modules/flock-tests | 2 +- modules/fopen | 2 +- modules/fopen-gnu | 2 +- modules/forkpty | 2 +- modules/fputc-tests | 2 +- modules/fread-tests | 2 +- modules/freadahead-tests | 2 +- modules/freadptr-tests | 2 +- modules/freadseek-tests | 2 +- modules/free-posix-tests | 2 +- modules/fstat | 2 +- modules/fsync | 2 +- modules/ftruncate | 2 +- modules/fwrite-tests | 2 +- modules/get-rusage-as | 2 +- modules/get-rusage-data | 2 +- modules/get_ppid_of | 2 +- modules/get_progname_of | 2 +- modules/getcwd | 2 +- modules/getcwd-lgpl | 2 +- modules/getdomainname | 2 +- modules/getdtablesize | 2 +- modules/getentropy | 2 +- modules/getgroups | 2 +- modules/gethostname | 2 +- modules/getlogin | 2 +- modules/getlogin_r | 2 +- modules/getopt-gnu-tests | 2 +- modules/getopt-posix | 2 +- modules/getopt-posix-tests | 2 +- modules/getpagesize | 2 +- modules/getpass | 2 +- modules/getumask | 2 +- modules/getusershell | 2 +- modules/glob | 2 +- modules/group-member | 2 +- modules/idpriv-drop | 2 +- modules/idpriv-droptemp | 2 +- modules/isapipe | 2 +- modules/isatty | 2 +- modules/isatty-tests | 2 +- modules/javacomp | 2 +- modules/lchmod | 2 +- modules/lchown | 2 +- modules/libtextstyle-optional | 2 +- modules/link | 2 +- modules/linkat | 2 +- modules/lseek | 2 +- modules/mkdirat | 2 +- modules/nonblocking | 2 +- modules/nonblocking-pipe-tests | 2 +- modules/nonblocking-socket-tests | 2 +- modules/nproc | 2 +- modules/openat-h | 2 +- modules/opendir | 2 +- modules/pagealign_alloc | 2 +- modules/pathmax | 2 +- modules/physmem | 2 +- modules/pipe-filter-gi | 2 +- modules/pipe-filter-ii | 2 +- modules/pipe-posix | 2 +- modules/pipe2 | 2 +- modules/posix_spawn-internal | 2 +- modules/posix_spawn-tests | 2 +- modules/posix_spawnp-tests | 2 +- modules/posixcheck | 2 +- modules/pread | 2 +- modules/pselect-tests | 2 +- modules/pwrite | 2 +- modules/raise-tests | 2 +- modules/read | 2 +- modules/readlink | 2 +- modules/readlinkat | 2 +- modules/relocatable-prog | 2 +- modules/relocatable-prog-wrapper | 2 +- modules/rmdir | 2 +- modules/savewd | 2 +- modules/select-tests | 2 +- modules/selinux-at | 2 +- modules/setenv | 2 +- modules/sethostname | 2 +- modules/sigpipe | 2 +- modules/sleep | 2 +- modules/spawn-pipe | 2 +- modules/stat-time-tests | 2 +- modules/stdlib-h | 2 +- modules/stdopen | 2 +- modules/symlink | 2 +- modules/symlinkat | 2 +- modules/sys_ioctl-h | 2 +- modules/system-quote-tests | 2 +- modules/term-style-control-tests | 2 +- modules/termcap-tests | 2 +- modules/terminfo-tests | 2 +- modules/truncate | 2 +- modules/ttyname_r | 2 +- modules/unistd | 238 +---------------- modules/unistd-c++-tests | 19 -- modules/unistd-h | 249 ++++++++++++++++++ modules/unistd-h-c++-tests | 19 ++ modules/unistd-h-tests | 12 + modules/unistd-safer | 2 +- modules/unistd-tests | 12 - modules/unlink | 2 +- modules/unlinkat | 2 +- modules/unsetenv | 2 +- modules/usleep | 2 +- modules/vma-iter | 2 +- modules/wait-process | 2 +- modules/windows-spawn | 2 +- modules/write | 2 +- modules/xnanosleep | 2 +- ...est-unistd-c++.cc => test-unistd-h-c++.cc} | 0 tests/{test-unistd.c => test-unistd-h.c} | 0 170 files changed, 463 insertions(+), 425 deletions(-) delete mode 100644 modules/unistd-c++-tests create mode 100644 modules/unistd-h create mode 100644 modules/unistd-h-c++-tests create mode 100644 modules/unistd-h-tests delete mode 100644 modules/unistd-tests rename tests/{test-unistd-c++.cc => test-unistd-h-c++.cc} (100%) rename tests/{test-unistd.c => test-unistd-h.c} (100%) diff --git a/ChangeLog b/ChangeLog index bd47146e5c..d672709aa8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2024-12-27 Bruno Haible + + Rename module unistd to unistd-h. + * modules/unistd-h: Renamed from modules/unistd. + * modules/unistd-h-tests: Renamed from modules/unistd-tests. + * modules/unistd-h-c++-tests: Renamed from modules/unistd-c++-tests. + * tests/test-unistd-h.c: Renamed from tests/test-unistd.c. + * tests/test-unistd-h-c++.cc: Renamed from tests/test-unistd-c++.cc. + * doc/posix-headers/unistd.texi: Update. + * doc/posix-functions/_exit.texi: Update. + * modules/* (Depends-on): Update. + * modules/unistd: New file. + 2024-12-27 Bruno Haible Rename module uchar-c23 to uchar-h-c23. diff --git a/doc/posix-functions/_exit.texi b/doc/posix-functions/_exit.texi index 1673102849..1647a81263 100644 --- a/doc/posix-functions/_exit.texi +++ b/doc/posix-functions/_exit.texi @@ -4,8 +4,8 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/_exit.html} -Gnulib module: unistd -@mindex unistd +Gnulib module: unistd-h +@mindex unistd-h Portability problems fixed by Gnulib: @itemize diff --git a/doc/posix-headers/unistd.texi b/doc/posix-headers/unistd.texi index 9e7d49e732..70c9a87154 100644 --- a/doc/posix-headers/unistd.texi +++ b/doc/posix-headers/unistd.texi @@ -3,8 +3,8 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/unistd.h.html} -Gnulib module: unistd -@mindex unistd +Gnulib module: unistd-h +@mindex unistd-h Portability problems fixed by Gnulib: @itemize diff --git a/modules/_Exit b/modules/_Exit index 3258de8957..21f2ca173f 100644 --- a/modules/_Exit +++ b/modules/_Exit @@ -7,7 +7,7 @@ m4/_Exit.m4 Depends-on: stdlib-h -unistd +unistd-h configure.ac: gl_FUNC__EXIT diff --git a/modules/access b/modules/access index 543857a1fa..fd03060252 100644 --- a/modules/access +++ b/modules/access @@ -6,7 +6,7 @@ lib/access.c m4/access.m4 Depends-on: -unistd +unistd-h fcntl stat diff --git a/modules/acl-tests b/modules/acl-tests index 7cb39e9758..5add9405bc 100644 --- a/modules/acl-tests +++ b/modules/acl-tests @@ -13,7 +13,7 @@ tests/macros.h Depends-on: file-has-acl-tests read-file -unistd +unistd-h xalloc test-framework-sh diff --git a/modules/areadlink-with-size b/modules/areadlink-with-size index ff2c7872bd..5fa73c4a6a 100644 --- a/modules/areadlink-with-size +++ b/modules/areadlink-with-size @@ -11,7 +11,7 @@ limits-h readlink ssize_t stdint-h -unistd +unistd-h configure.ac: diff --git a/modules/areadlinkat-with-size b/modules/areadlinkat-with-size index b0a1cdefa6..1834d02484 100644 --- a/modules/areadlinkat-with-size +++ b/modules/areadlinkat-with-size @@ -21,7 +21,7 @@ limits-h openat-die openat-h save-cwd -unistd +unistd-h configure.ac: gl_MODULE_INDICATOR([areadlinkat-with-size]) diff --git a/modules/at-internal b/modules/at-internal index 4b70b1f61a..56e884e1e8 100644 --- a/modules/at-internal +++ b/modules/at-internal @@ -11,7 +11,7 @@ fcntl-h intprops open [case $host_os in mingw* | windows*) false;; *) :;; esac] sys_stat-h -unistd +unistd-h configure.ac: AC_REQUIRE([AC_CANONICAL_HOST]) diff --git a/modules/atexit-tests b/modules/atexit-tests index 815fce08d2..922dcd56a8 100644 --- a/modules/atexit-tests +++ b/modules/atexit-tests @@ -5,7 +5,7 @@ tests/test-atexit.c Depends-on: test-framework-sh -unistd +unistd-h configure.ac: diff --git a/modules/c-stack b/modules/c-stack index a9d0805e26..fcb6bf9651 100644 --- a/modules/c-stack +++ b/modules/c-stack @@ -20,7 +20,7 @@ mempcpy raise sigsegv stddef-h -unistd +unistd-h configure.ac: gl_C_STACK diff --git a/modules/canonicalize b/modules/canonicalize index 6abcde32cb..1c263e8bce 100644 --- a/modules/canonicalize +++ b/modules/canonicalize @@ -28,7 +28,7 @@ glibc-internal/scratch_buffer stat stdbool-h sys_stat-h -unistd +unistd-h xalloc-die configure.ac: diff --git a/modules/canonicalize-lgpl b/modules/canonicalize-lgpl index 04d68e5563..bc99dd8d1f 100644 --- a/modules/canonicalize-lgpl +++ b/modules/canonicalize-lgpl @@ -28,7 +28,7 @@ glibc-internal/scratch_buffer [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $RE stat [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] stdbool-h [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] sys_stat-h [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] -unistd [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] +unistd-h [test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1] configure.ac: gl_CANONICALIZE_LGPL diff --git a/modules/careadlinkat b/modules/careadlinkat index 05e54e8829..557fc6d159 100644 --- a/modules/careadlinkat +++ b/modules/careadlinkat @@ -11,7 +11,7 @@ idx limits-h minmax ssize_t -unistd +unistd-h configure.ac: AC_REQUIRE([AC_C_RESTRICT]) diff --git a/modules/chdir b/modules/chdir index caa9c2cdfb..350418728c 100644 --- a/modules/chdir +++ b/modules/chdir @@ -4,7 +4,7 @@ chdir() function: switch to another current directory Files: Depends-on: -unistd +unistd-h configure.ac: gl_UNISTD_MODULE_INDICATOR([chdir]) diff --git a/modules/chdir-long b/modules/chdir-long index 3eee2c2b1a..a533331a1d 100644 --- a/modules/chdir-long +++ b/modules/chdir-long @@ -8,7 +8,7 @@ m4/chdir-long.m4 m4/pathmax.m4 Depends-on: -unistd +unistd-h pathmax chdir assure [test $gl_cv_have_unlimited_file_name_length = no] diff --git a/modules/chown b/modules/chown index 2ab3c3fd97..4f9163e43b 100644 --- a/modules/chown +++ b/modules/chown @@ -7,7 +7,7 @@ lib/fchown-stub.c m4/chown.m4 Depends-on: -unistd +unistd-h fstat [test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1] open [test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1] stat [test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1] diff --git a/modules/clean-temp b/modules/clean-temp index 6bb95be065..3309ac3481 100644 --- a/modules/clean-temp +++ b/modules/clean-temp @@ -11,7 +11,7 @@ stdbool-h clean-temp-simple list asyncsafe-spin -unistd +unistd-h lock thread-optim error diff --git a/modules/clean-temp-simple b/modules/clean-temp-simple index b7feaee809..e56b1b03d0 100644 --- a/modules/clean-temp-simple +++ b/modules/clean-temp-simple @@ -11,7 +11,7 @@ c99 stdbool-h list asyncsafe-spin -unistd +unistd-h lock once thread-optim diff --git a/modules/close b/modules/close index fbb54063c6..45b3a29062 100644 --- a/modules/close +++ b/modules/close @@ -6,7 +6,7 @@ lib/close.c m4/close.m4 Depends-on: -unistd +unistd-h fd-hook [test $REPLACE_CLOSE = 1] msvc-inval [test $REPLACE_CLOSE = 1] diff --git a/modules/closein b/modules/closein index 1c135ba9c2..8374fe1553 100644 --- a/modules/closein +++ b/modules/closein @@ -12,7 +12,7 @@ fflush gettext-h gnulib-i18n stdbool-h -unistd +unistd-h configure.ac: diff --git a/modules/closeout b/modules/closeout index 3a5596b5fc..1022680bec 100644 --- a/modules/closeout +++ b/modules/closeout @@ -13,7 +13,7 @@ error quotearg exitfail stdbool-h -unistd +unistd-h configure.ac: diff --git a/modules/copy-file b/modules/copy-file index d72de05328..c63bba9a77 100644 --- a/modules/copy-file +++ b/modules/copy-file @@ -24,7 +24,7 @@ quote safe-read stat-time stdlib-h -unistd +unistd-h utimens configure.ac: diff --git a/modules/copy-file-range b/modules/copy-file-range index 4707f97561..12b6fcb86e 100644 --- a/modules/copy-file-range +++ b/modules/copy-file-range @@ -7,7 +7,7 @@ m4/copy-file-range.m4 Depends-on: largefile -unistd +unistd-h configure.ac: gl_FUNC_COPY_FILE_RANGE diff --git a/modules/dfa-tests b/modules/dfa-tests index 6cdacf985f..8ae462bda6 100644 --- a/modules/dfa-tests +++ b/modules/dfa-tests @@ -9,7 +9,7 @@ binary-io stdio-h stdlib-h string-h -unistd +unistd-h regex setlocale test-framework-sh diff --git a/modules/dup b/modules/dup index 2f42e07356..a6bdf37ba7 100644 --- a/modules/dup +++ b/modules/dup @@ -6,7 +6,7 @@ lib/dup.c m4/dup.m4 Depends-on: -unistd +unistd-h msvc-inval [test $REPLACE_DUP = 1] configure.ac: diff --git a/modules/dup2 b/modules/dup2 index acbc017069..c297a625ab 100644 --- a/modules/dup2 +++ b/modules/dup2 @@ -6,7 +6,7 @@ lib/dup2.c m4/dup2.m4 Depends-on: -unistd +unistd-h msvc-inval [test $REPLACE_DUP2 = 1] msvc-nothrow [test $REPLACE_DUP2 = 1] diff --git a/modules/dup3 b/modules/dup3 index c007e7258c..966cbd2725 100644 --- a/modules/dup3 +++ b/modules/dup3 @@ -6,7 +6,7 @@ lib/dup3.c m4/dup3.m4 Depends-on: -unistd +unistd-h fcntl binary-io getdtablesize diff --git a/modules/eloop-threshold b/modules/eloop-threshold index 60433e530c..3cb5834cc6 100644 --- a/modules/eloop-threshold +++ b/modules/eloop-threshold @@ -6,7 +6,7 @@ lib/eloop-threshold.h Depends-on: minmax -unistd +unistd-h configure.ac: diff --git a/modules/environ b/modules/environ index 5c9c836313..fe5bf39ddd 100644 --- a/modules/environ +++ b/modules/environ @@ -5,7 +5,7 @@ Files: m4/environ.m4 Depends-on: -unistd +unistd-h extensions configure.ac: diff --git a/modules/error b/modules/error index e3b8a65449..f7fbfa6347 100644 --- a/modules/error +++ b/modules/error @@ -13,7 +13,7 @@ getprogname [test $COMPILE_ERROR_C = 1] gettext-h [test $COMPILE_ERROR_C = 1] gnulib-i18n [test $COMPILE_ERROR_C = 1] strerror [test $COMPILE_ERROR_C = 1] -unistd [test $COMPILE_ERROR_C = 1] +unistd-h [test $COMPILE_ERROR_C = 1] msvc-nothrow [test $COMPILE_ERROR_C = 1] configure.ac: diff --git a/modules/euidaccess b/modules/euidaccess index 5fa0e3dc4a..566667cabf 100644 --- a/modules/euidaccess +++ b/modules/euidaccess @@ -6,7 +6,7 @@ lib/euidaccess.c m4/euidaccess.m4 Depends-on: -unistd +unistd-h extensions root-uid fcntl-h diff --git a/modules/execl b/modules/execl index 8465221c67..611b47c18c 100644 --- a/modules/execl +++ b/modules/execl @@ -6,7 +6,7 @@ lib/execl.c m4/execl.m4 Depends-on: -unistd +unistd-h execv [test $REPLACE_EXECL = 1] malloca [test $REPLACE_EXECL = 1] diff --git a/modules/execle b/modules/execle index 586efa177c..b8426e8134 100644 --- a/modules/execle +++ b/modules/execle @@ -6,7 +6,7 @@ lib/execle.c m4/execle.m4 Depends-on: -unistd +unistd-h execve [test $REPLACE_EXECLE = 1] malloca [test $REPLACE_EXECLE = 1] diff --git a/modules/execlp b/modules/execlp index 769b3f4528..81708a86fc 100644 --- a/modules/execlp +++ b/modules/execlp @@ -6,7 +6,7 @@ lib/execlp.c m4/execlp.m4 Depends-on: -unistd +unistd-h execvp [test $REPLACE_EXECLP = 1] malloca [test $REPLACE_EXECLP = 1] diff --git a/modules/execute b/modules/execute index c847eddf27..80f102c4d7 100644 --- a/modules/execute +++ b/modules/execute @@ -32,7 +32,7 @@ posix_spawnattr_destroy stdbool-h stdlib-h sys_wait-h -unistd +unistd-h wait-process windows-spawn xalloc-die diff --git a/modules/execute-tests b/modules/execute-tests index 8f6bdd15cc..60bcbe7c78 100644 --- a/modules/execute-tests +++ b/modules/execute-tests @@ -17,7 +17,7 @@ msvc-inval read-file stdbool-h stdint-h -unistd +unistd-h configure.ac: dnl Test for Linux system call close_range(), declared in . diff --git a/modules/execv b/modules/execv index 244d79405f..c303be2ae2 100644 --- a/modules/execv +++ b/modules/execv @@ -6,7 +6,7 @@ lib/execv.c m4/execv.m4 Depends-on: -unistd +unistd-h environ [test $REPLACE_EXECV = 1] execve [test $REPLACE_EXECV = 1] diff --git a/modules/execve b/modules/execve index f9f034d1dd..39a981df8b 100644 --- a/modules/execve +++ b/modules/execve @@ -6,7 +6,7 @@ lib/execve.c m4/execve.m4 Depends-on: -unistd +unistd-h posix_spawn [test $REPLACE_EXECVE = 1] close [test $REPLACE_EXECVE = 1] sys_wait-h [test $REPLACE_EXECVE = 1] diff --git a/modules/execvp b/modules/execvp index 0436444d8c..3f396156f7 100644 --- a/modules/execvp +++ b/modules/execvp @@ -6,7 +6,7 @@ lib/execvp.c m4/execvp.m4 Depends-on: -unistd +unistd-h environ [test $REPLACE_EXECVP = 1] execvpe [test $REPLACE_EXECVP = 1] diff --git a/modules/execvpe b/modules/execvpe index b15df01cc7..7ca8859dbe 100644 --- a/modules/execvpe +++ b/modules/execvpe @@ -6,7 +6,7 @@ lib/execvpe.c m4/execvpe.m4 Depends-on: -unistd +unistd-h extensions free-posix [test $HAVE_EXECVPE = 0 || test $REPLACE_EXECVPE = 1] stdbool-h [test $HAVE_EXECVPE = 0 || test $REPLACE_EXECVPE = 1] diff --git a/modules/faccessat b/modules/faccessat index 90513909f2..ed2a338a53 100644 --- a/modules/faccessat +++ b/modules/faccessat @@ -7,7 +7,7 @@ lib/at-func.c m4/faccessat.m4 Depends-on: -unistd +unistd-h extensions at-internal [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1] errno-h [test $HAVE_FACCESSAT = 0 || test $REPLACE_FACCESSAT = 1] diff --git a/modules/fatal-signal b/modules/fatal-signal index 8c847a1096..25e7cfa81c 100644 --- a/modules/fatal-signal +++ b/modules/fatal-signal @@ -10,7 +10,7 @@ m4/sig_atomic_t.m4 Depends-on: c99 stdbool-h -unistd +unistd-h sigaction lock once diff --git a/modules/fchdir b/modules/fchdir index e9430bcc72..986b231d7a 100644 --- a/modules/fchdir +++ b/modules/fchdir @@ -7,7 +7,7 @@ m4/fchdir.m4 Depends-on: dirent-h -unistd +unistd-h assure [test $HAVE_FCHDIR = 0 || test $REPLACE_FCHDIR = 1] chdir [test $HAVE_FCHDIR = 0 || test $REPLACE_FCHDIR = 1] close [test $HAVE_FCHDIR = 0 || test $REPLACE_FCHDIR = 1] diff --git a/modules/fchmodat b/modules/fchmodat index c99baf63c3..3afd0efd30 100644 --- a/modules/fchmodat +++ b/modules/fchmodat @@ -11,7 +11,7 @@ sys_stat-h extensions errno-h [test $HAVE_FCHMODAT = 0 || test $REPLACE_FCHMODAT = 1] fcntl-h [test $HAVE_FCHMODAT = 0 || test $REPLACE_FCHMODAT = 1] -unistd [test $HAVE_FCHMODAT = 0 || test $REPLACE_FCHMODAT = 1] +unistd-h [test $HAVE_FCHMODAT = 0 || test $REPLACE_FCHMODAT = 1] intprops [test $HAVE_FCHMODAT = 0 || test $REPLACE_FCHMODAT = 1] c99 [test $REPLACE_FCHMODAT = 1] at-internal [test $HAVE_FCHMODAT = 0] diff --git a/modules/fchownat b/modules/fchownat index 44d5cfc9b6..e373463d0e 100644 --- a/modules/fchownat +++ b/modules/fchownat @@ -7,7 +7,7 @@ lib/at-func.c m4/fchownat.m4 Depends-on: -unistd +unistd-h extensions at-internal [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1] errno-h [test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1] diff --git a/modules/fcntl-h b/modules/fcntl-h index 9ea889dfd9..2f383ff0c8 100644 --- a/modules/fcntl-h +++ b/modules/fcntl-h @@ -15,7 +15,7 @@ snippet/arg-nonnull snippet/c++defs snippet/warn-on-use sys_types-h -unistd +unistd-h configure.ac: gl_FCNTL_H diff --git a/modules/fd-hook b/modules/fd-hook index ea99919c5f..38cab56f73 100644 --- a/modules/fd-hook +++ b/modules/fd-hook @@ -6,7 +6,7 @@ lib/fd-hook.h lib/fd-hook.c Depends-on: -unistd +unistd-h configure.ac: diff --git a/modules/fdatasync b/modules/fdatasync index 4d13a97cdb..d8f2efabb0 100644 --- a/modules/fdatasync +++ b/modules/fdatasync @@ -7,7 +7,7 @@ m4/fdatasync.m4 Depends-on: fsync [test $HAVE_FDATASYNC = 0 || test $REPLACE_FDATASYNC = 1] -unistd +unistd-h configure.ac: gl_FUNC_FDATASYNC diff --git a/modules/fflush b/modules/fflush index 0f76f0d669..e2521abc38 100644 --- a/modules/fflush +++ b/modules/fflush @@ -12,7 +12,7 @@ fpurge [test $REPLACE_FFLUSH = 1] ftello [test $REPLACE_FFLUSH = 1] freading [test $REPLACE_FFLUSH = 1] lseek [test $REPLACE_FFLUSH = 1] -unistd [test $REPLACE_FFLUSH = 1] +unistd-h [test $REPLACE_FFLUSH = 1] fseeko [test $REPLACE_FFLUSH = 1] configure.ac-early: diff --git a/modules/fgetc-tests b/modules/fgetc-tests index 9e2934d97b..b3d4e5856e 100644 --- a/modules/fgetc-tests +++ b/modules/fgetc-tests @@ -4,7 +4,7 @@ tests/signature.h tests/macros.h Depends-on: -unistd +unistd-h fdopen msvc-inval diff --git a/modules/file-has-acl-tests b/modules/file-has-acl-tests index 843d55b515..f34d8733f9 100644 --- a/modules/file-has-acl-tests +++ b/modules/file-has-acl-tests @@ -6,7 +6,7 @@ tests/test-file-has-acl.c tests/macros.h Depends-on: -unistd +unistd-h test-framework-sh configure.ac: diff --git a/modules/filemode-tests b/modules/filemode-tests index 985de90272..da025e981e 100644 --- a/modules/filemode-tests +++ b/modules/filemode-tests @@ -3,7 +3,7 @@ tests/test-filemode.c tests/macros.h Depends-on: -unistd +unistd-h configure.ac: diff --git a/modules/findprog b/modules/findprog index dd35034b75..da9d51c221 100644 --- a/modules/findprog +++ b/modules/findprog @@ -14,7 +14,7 @@ xalloc xconcat-filename access stat -unistd +unistd-h configure.ac: gl_FINDPROG diff --git a/modules/findprog-in b/modules/findprog-in index 9710899134..f4ff89587a 100644 --- a/modules/findprog-in +++ b/modules/findprog-in @@ -16,7 +16,7 @@ access stat strdup-posix malloc-posix -unistd +unistd-h configure.ac: gl_FINDPROG_IN diff --git a/modules/findprog-lgpl b/modules/findprog-lgpl index 98301787ba..e7d273a2e1 100644 --- a/modules/findprog-lgpl +++ b/modules/findprog-lgpl @@ -15,7 +15,7 @@ strdup concat-filename access stat -unistd +unistd-h configure.ac: gl_FINDPROG diff --git a/modules/flock-tests b/modules/flock-tests index 27670e92aa..a1bb790efa 100644 --- a/modules/flock-tests +++ b/modules/flock-tests @@ -4,7 +4,7 @@ tests/signature.h tests/macros.h Depends-on: -unistd +unistd-h test-xfail configure.ac: diff --git a/modules/fopen b/modules/fopen index 6bfb4c08c5..ad06df283d 100644 --- a/modules/fopen +++ b/modules/fopen @@ -12,7 +12,7 @@ stdio-h largefile fcntl-h [test $REPLACE_FOPEN = 1] stdbool-h [test $REPLACE_FOPEN = 1] -unistd [test $REPLACE_FOPEN = 1] +unistd-h [test $REPLACE_FOPEN = 1] close [test $REPLACE_FOPEN = 1] fstat [test $REPLACE_FOPEN = 1] diff --git a/modules/fopen-gnu b/modules/fopen-gnu index 7ee83015d1..65ff96c9a8 100644 --- a/modules/fopen-gnu +++ b/modules/fopen-gnu @@ -9,7 +9,7 @@ fopen open [test $REPLACE_FOPEN_FOR_FOPEN_GNU = 1] fcntl-h [test $REPLACE_FOPEN_FOR_FOPEN_GNU = 1] stdbool-h [test $REPLACE_FOPEN_FOR_FOPEN_GNU = 1] -unistd [test $REPLACE_FOPEN_FOR_FOPEN_GNU = 1] +unistd-h [test $REPLACE_FOPEN_FOR_FOPEN_GNU = 1] close [test $REPLACE_FOPEN_FOR_FOPEN_GNU = 1] fstat [test $REPLACE_FOPEN_FOR_FOPEN_GNU = 1] diff --git a/modules/forkpty b/modules/forkpty index 0ff4bc750b..31bf3d0fd9 100644 --- a/modules/forkpty +++ b/modules/forkpty @@ -8,7 +8,7 @@ m4/pty.m4 Depends-on: pty-h -unistd +unistd-h openpty login_tty diff --git a/modules/fputc-tests b/modules/fputc-tests index 6d99adfcf6..ffe76ca763 100644 --- a/modules/fputc-tests +++ b/modules/fputc-tests @@ -4,7 +4,7 @@ tests/signature.h tests/macros.h Depends-on: -unistd +unistd-h fdopen msvc-inval diff --git a/modules/fread-tests b/modules/fread-tests index 0423ffc297..adb4ffc1b2 100644 --- a/modules/fread-tests +++ b/modules/fread-tests @@ -4,7 +4,7 @@ tests/signature.h tests/macros.h Depends-on: -unistd +unistd-h fdopen msvc-inval diff --git a/modules/freadahead-tests b/modules/freadahead-tests index 1b53268a15..1dd73ef310 100644 --- a/modules/freadahead-tests +++ b/modules/freadahead-tests @@ -5,7 +5,7 @@ tests/macros.h Depends-on: lseek -unistd +unistd-h configure.ac: diff --git a/modules/freadptr-tests b/modules/freadptr-tests index f8bf1bc57d..fdb44af041 100644 --- a/modules/freadptr-tests +++ b/modules/freadptr-tests @@ -7,7 +7,7 @@ tests/macros.h Depends-on: lseek -unistd +unistd-h configure.ac: diff --git a/modules/freadseek-tests b/modules/freadseek-tests index d101582d22..86dfeebd7e 100644 --- a/modules/freadseek-tests +++ b/modules/freadseek-tests @@ -4,7 +4,7 @@ tests/test-freadseek.sh tests/macros.h Depends-on: -unistd +unistd-h configure.ac: diff --git a/modules/free-posix-tests b/modules/free-posix-tests index 8e81c22149..8745445f56 100644 --- a/modules/free-posix-tests +++ b/modules/free-posix-tests @@ -3,7 +3,7 @@ tests/test-free.c tests/macros.h Depends-on: -unistd +unistd-h configure.ac: diff --git a/modules/fstat b/modules/fstat index f7468dbc1b..432742e979 100644 --- a/modules/fstat +++ b/modules/fstat @@ -13,7 +13,7 @@ largefile pathmax [test $REPLACE_FSTAT = 1] stat [test $REPLACE_FSTAT = 1] stat-time [test $REPLACE_FSTAT = 1] -unistd [test $REPLACE_FSTAT = 1] +unistd-h [test $REPLACE_FSTAT = 1] assert-h [test $REPLACE_FSTAT = 1] msvc-nothrow [test $REPLACE_FSTAT = 1] diff --git a/modules/fsync b/modules/fsync index 3475933579..27285ddaed 100644 --- a/modules/fsync +++ b/modules/fsync @@ -6,7 +6,7 @@ lib/fsync.c m4/fsync.m4 Depends-on: -unistd +unistd-h msvc-nothrow [test $HAVE_FSYNC = 0] configure.ac: diff --git a/modules/ftruncate b/modules/ftruncate index be79ee513e..d1f51d5e5f 100644 --- a/modules/ftruncate +++ b/modules/ftruncate @@ -6,7 +6,7 @@ lib/ftruncate.c m4/ftruncate.m4 Depends-on: -unistd +unistd-h sys_types-h largefile msvc-nothrow [test $HAVE_FTRUNCATE = 0 || test $REPLACE_FTRUNCATE = 1] diff --git a/modules/fwrite-tests b/modules/fwrite-tests index 1b7bf2f8be..63f2bb50ae 100644 --- a/modules/fwrite-tests +++ b/modules/fwrite-tests @@ -4,7 +4,7 @@ tests/signature.h tests/macros.h Depends-on: -unistd +unistd-h fdopen msvc-inval diff --git a/modules/get-rusage-as b/modules/get-rusage-as index 41796a1de7..ecb41e1b2a 100644 --- a/modules/get-rusage-as +++ b/modules/get-rusage-as @@ -8,7 +8,7 @@ m4/mmap-anon.m4 Depends-on: stdint-h -unistd +unistd-h extensions getpagesize open diff --git a/modules/get-rusage-data b/modules/get-rusage-data index 1b8e40171c..1a7bf89903 100644 --- a/modules/get-rusage-data +++ b/modules/get-rusage-data @@ -8,7 +8,7 @@ m4/mmap-anon.m4 Depends-on: stdint-h -unistd +unistd-h extensions getpagesize vma-iter diff --git a/modules/get_ppid_of b/modules/get_ppid_of index bc38b8c214..361a375f2b 100644 --- a/modules/get_ppid_of +++ b/modules/get_ppid_of @@ -8,7 +8,7 @@ lib/get_ppid_of.c Depends-on: extensions sys_types-h -unistd +unistd-h open configure.ac: diff --git a/modules/get_progname_of b/modules/get_progname_of index 51cef7ef42..252f86ac9a 100644 --- a/modules/get_progname_of +++ b/modules/get_progname_of @@ -7,7 +7,7 @@ lib/get_progname_of.c Depends-on: extensions -unistd +unistd-h open configure.ac: diff --git a/modules/getcwd b/modules/getcwd index 954b371e31..95e2b54627 100644 --- a/modules/getcwd +++ b/modules/getcwd @@ -9,7 +9,7 @@ m4/getcwd.m4 m4/pathmax.m4 Depends-on: -unistd +unistd-h extensions pathmax [test $REPLACE_GETCWD = 1] msvc-inval [test $REPLACE_GETCWD = 1] diff --git a/modules/getcwd-lgpl b/modules/getcwd-lgpl index ae11d286b4..099b7755d3 100644 --- a/modules/getcwd-lgpl +++ b/modules/getcwd-lgpl @@ -6,7 +6,7 @@ lib/getcwd-lgpl.c m4/getcwd.m4 Depends-on: -unistd +unistd-h free-posix [test $REPLACE_GETCWD = 1] strdup [test $REPLACE_GETCWD = 1] diff --git a/modules/getdomainname b/modules/getdomainname index 80f1112f0d..b1f50486a5 100644 --- a/modules/getdomainname +++ b/modules/getdomainname @@ -6,7 +6,7 @@ lib/getdomainname.c m4/getdomainname.m4 Depends-on: -unistd +unistd-h extensions netdb-h [test $HAVE_DECL_GETDOMAINNAME = 0 || test $REPLACE_GETDOMAINNAME = 1] sys_socket-h [test $HAVE_DECL_GETDOMAINNAME = 0 || test $REPLACE_GETDOMAINNAME = 1] diff --git a/modules/getdtablesize b/modules/getdtablesize index fa0392400b..6087c4bf50 100644 --- a/modules/getdtablesize +++ b/modules/getdtablesize @@ -6,7 +6,7 @@ lib/getdtablesize.c m4/getdtablesize.m4 Depends-on: -unistd +unistd-h extensions msvc-inval [test $HAVE_GETDTABLESIZE = 0] diff --git a/modules/getentropy b/modules/getentropy index 3b0c434547..ac20209163 100644 --- a/modules/getentropy +++ b/modules/getentropy @@ -8,7 +8,7 @@ m4/getentropy.m4 Depends-on: getrandom [test $HAVE_GETENTROPY = 0 || test $REPLACE_GETENTROPY = 1] extensions -unistd +unistd-h configure.ac: gl_FUNC_GETENTROPY diff --git a/modules/getgroups b/modules/getgroups index eef80a4a78..8d8f4d1e38 100644 --- a/modules/getgroups +++ b/modules/getgroups @@ -6,7 +6,7 @@ lib/getgroups.c m4/getgroups.m4 Depends-on: -unistd +unistd-h free-posix [test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1] malloc-posix [test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1] stdint-h [test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1] diff --git a/modules/gethostname b/modules/gethostname index 0ba2634218..0e4cc30f14 100644 --- a/modules/gethostname +++ b/modules/gethostname @@ -7,7 +7,7 @@ m4/gethostname.m4 lib/w32sock.h Depends-on: -unistd +unistd-h sys_socket-h [test $HAVE_GETHOSTNAME = 0] errno-h [test $HAVE_GETHOSTNAME = 0] sockets [test $HAVE_GETHOSTNAME = 0] diff --git a/modules/getlogin b/modules/getlogin index c73b2a9a2e..8725a7031e 100644 --- a/modules/getlogin +++ b/modules/getlogin @@ -6,7 +6,7 @@ lib/getlogin.c m4/getlogin.m4 Depends-on: -unistd +unistd-h configure.ac: gl_FUNC_GETLOGIN diff --git a/modules/getlogin_r b/modules/getlogin_r index 843bcde19c..de85572dc9 100644 --- a/modules/getlogin_r +++ b/modules/getlogin_r @@ -7,7 +7,7 @@ m4/getlogin_r.m4 m4/getlogin.m4 Depends-on: -unistd +unistd-h extensions malloca [test $HAVE_GETLOGIN_R = 0 || test $REPLACE_GETLOGIN_R = 1] memchr [test $HAVE_GETLOGIN_R = 0 || test $REPLACE_GETLOGIN_R = 1] diff --git a/modules/getopt-gnu-tests b/modules/getopt-gnu-tests index 67cbe8a064..3f93065794 100644 --- a/modules/getopt-gnu-tests +++ b/modules/getopt-gnu-tests @@ -10,7 +10,7 @@ Depends-on: dup2 setenv stdbool-h -unistd +unistd-h unsetenv configure.ac: diff --git a/modules/getopt-posix b/modules/getopt-posix index d8d628ab56..28ab405471 100644 --- a/modules/getopt-posix +++ b/modules/getopt-posix @@ -15,7 +15,7 @@ m4/getopt.m4 m4/sys_cdefs_h.m4 Depends-on: -unistd +unistd-h extensions include_next gen-header diff --git a/modules/getopt-posix-tests b/modules/getopt-posix-tests index 6b36c1e738..d7020c24ae 100644 --- a/modules/getopt-posix-tests +++ b/modules/getopt-posix-tests @@ -9,7 +9,7 @@ Depends-on: dup2 setenv stdbool-h -unistd +unistd-h unsetenv configure.ac: diff --git a/modules/getpagesize b/modules/getpagesize index a883edf067..3148cbcaca 100644 --- a/modules/getpagesize +++ b/modules/getpagesize @@ -6,7 +6,7 @@ lib/getpagesize.c m4/getpagesize.m4 Depends-on: -unistd +unistd-h configure.ac: gl_FUNC_GETPAGESIZE diff --git a/modules/getpass b/modules/getpass index 24b4214aff..0c575f0984 100644 --- a/modules/getpass +++ b/modules/getpass @@ -8,7 +8,7 @@ m4/getpass.m4 m4/tcgetattr.m4 Depends-on: -unistd +unistd-h extensions fopen-gnu fseeko diff --git a/modules/getumask b/modules/getumask index 8484c4b15d..5c475a2003 100644 --- a/modules/getumask +++ b/modules/getumask @@ -9,7 +9,7 @@ Depends-on: sys_stat-h extensions c99 [test $HAVE_GETUMASK = 0] -unistd [test $HAVE_GETUMASK = 0] +unistd-h [test $HAVE_GETUMASK = 0] clean-temp [test $HAVE_GETUMASK = 0] tempname [test $HAVE_GETUMASK = 0] diff --git a/modules/getusershell b/modules/getusershell index c9ef576e25..a9f7fc9976 100644 --- a/modules/getusershell +++ b/modules/getusershell @@ -6,7 +6,7 @@ lib/getusershell.c m4/getusershell.m4 Depends-on: -unistd +unistd-h extensions fopen [test $HAVE_GETUSERSHELL = 0 || test $REPLACE_GETUSERSHELL = 1] getline [test $HAVE_GETUSERSHELL = 0 || test $REPLACE_GETUSERSHELL = 1] diff --git a/modules/glob b/modules/glob index 20bf5cddba..a1a1329530 100644 --- a/modules/glob +++ b/modules/glob @@ -32,7 +32,7 @@ stdbool-h [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] stdckdint-h [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] stdint-h [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] strdup [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] -unistd [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] +unistd-h [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] malloc-posix [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1] configure.ac: diff --git a/modules/group-member b/modules/group-member index 619b6318ef..f058d88419 100644 --- a/modules/group-member +++ b/modules/group-member @@ -6,7 +6,7 @@ lib/group-member.c m4/group-member.m4 Depends-on: -unistd +unistd-h extensions getgroups [test $HAVE_GROUP_MEMBER = 0] malloc-gnu [test $HAVE_GROUP_MEMBER = 0] diff --git a/modules/idpriv-drop b/modules/idpriv-drop index e7f0a1d7de..60ed6500e7 100644 --- a/modules/idpriv-drop +++ b/modules/idpriv-drop @@ -7,7 +7,7 @@ lib/idpriv-drop.c m4/idpriv.m4 Depends-on: -unistd +unistd-h extensions configure.ac: diff --git a/modules/idpriv-droptemp b/modules/idpriv-droptemp index bbc9961de0..abe2ec07e1 100644 --- a/modules/idpriv-droptemp +++ b/modules/idpriv-droptemp @@ -7,7 +7,7 @@ lib/idpriv-droptemp.c m4/idpriv.m4 Depends-on: -unistd +unistd-h extensions configure.ac: diff --git a/modules/isapipe b/modules/isapipe index 5e401bfcf0..afea7ae4f9 100644 --- a/modules/isapipe +++ b/modules/isapipe @@ -9,7 +9,7 @@ m4/isapipe.m4 Depends-on: stdbool-h [test $HAVE_ISAPIPE = 0] sys_stat-h [test $HAVE_ISAPIPE = 0] -unistd [test $HAVE_ISAPIPE = 0] +unistd-h [test $HAVE_ISAPIPE = 0] msvc-nothrow [test $HAVE_ISAPIPE = 0] fstat [test $HAVE_ISAPIPE = 0] diff --git a/modules/isatty b/modules/isatty index dce8551c9f..e2fd7f09cd 100644 --- a/modules/isatty +++ b/modules/isatty @@ -6,7 +6,7 @@ lib/isatty.c m4/isatty.m4 Depends-on: -unistd +unistd-h msvc-inval [test $REPLACE_ISATTY = 1] msvc-nothrow [test $REPLACE_ISATTY = 1] diff --git a/modules/isatty-tests b/modules/isatty-tests index dff2d1723a..005a9016b5 100644 --- a/modules/isatty-tests +++ b/modules/isatty-tests @@ -4,7 +4,7 @@ tests/signature.h tests/macros.h Depends-on: -unistd +unistd-h pipe-posix configure.ac: diff --git a/modules/javacomp b/modules/javacomp index e966b07d0c..722414095f 100644 --- a/modules/javacomp +++ b/modules/javacomp @@ -7,7 +7,7 @@ lib/javacomp.c Depends-on: stdbool-h -unistd +unistd-h javaversion execute spawn-pipe diff --git a/modules/lchmod b/modules/lchmod index c6a529b8dc..c087bfa00c 100644 --- a/modules/lchmod +++ b/modules/lchmod @@ -14,7 +14,7 @@ intprops [test $HAVE_LCHMOD = 0] lstat [test $HAVE_LCHMOD = 0] readlink [test $HAVE_LCHMOD = 0] sys_stat-h -unistd [test $HAVE_LCHMOD = 0] +unistd-h [test $HAVE_LCHMOD = 0] configure.ac: gl_FUNC_LCHMOD diff --git a/modules/lchown b/modules/lchown index e0d20324d0..f817226ceb 100644 --- a/modules/lchown +++ b/modules/lchown @@ -6,7 +6,7 @@ lib/lchown.c m4/lchown.m4 Depends-on: -unistd +unistd-h readlink [test $HAVE_LCHOWN = 0] chown [test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1] errno-h [test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1] diff --git a/modules/libtextstyle-optional b/modules/libtextstyle-optional index 8f757224be..96c864aaa4 100644 --- a/modules/libtextstyle-optional +++ b/modules/libtextstyle-optional @@ -10,7 +10,7 @@ gen-header libtextstyle stdbool-h stdio-h -unistd +unistd-h fsync vasprintf-posix diff --git a/modules/link b/modules/link index a0aaf1bf4e..f7097b62d7 100644 --- a/modules/link +++ b/modules/link @@ -6,7 +6,7 @@ lib/link.c m4/link.m4 Depends-on: -unistd +unistd-h free-posix [test $HAVE_LINK = 0 || test $REPLACE_LINK = 1] stat [test $HAVE_LINK = 0 || test $REPLACE_LINK = 1] strdup-posix [test $HAVE_LINK = 0 || test $REPLACE_LINK = 1] diff --git a/modules/linkat b/modules/linkat index 4b0fcf1e6e..ae53d9fddf 100644 --- a/modules/linkat +++ b/modules/linkat @@ -7,7 +7,7 @@ lib/linkat.c m4/linkat.m4 Depends-on: -unistd +unistd-h extensions areadlink [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] at-internal [test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1] diff --git a/modules/lseek b/modules/lseek index a00d9beeb9..9491d973da 100644 --- a/modules/lseek +++ b/modules/lseek @@ -6,7 +6,7 @@ lib/lseek.c m4/lseek.m4 Depends-on: -unistd +unistd-h sys_types-h largefile msvc-nothrow [test $REPLACE_LSEEK = 1] diff --git a/modules/mkdirat b/modules/mkdirat index 71be95ce36..0471bf396a 100644 --- a/modules/mkdirat +++ b/modules/mkdirat @@ -18,7 +18,7 @@ mkdir [test $HAVE_MKDIRAT = 0] openat-die [test $HAVE_MKDIRAT = 0] openat-h [test $HAVE_MKDIRAT = 0] save-cwd [test $HAVE_MKDIRAT = 0] -unistd [test $HAVE_MKDIRAT = 0] +unistd-h [test $HAVE_MKDIRAT = 0] configure.ac: gl_FUNC_MKDIRAT diff --git a/modules/nonblocking b/modules/nonblocking index 6d059d4aaa..4e4eccb5d5 100644 --- a/modules/nonblocking +++ b/modules/nonblocking @@ -16,7 +16,7 @@ msvc-nothrow stdbool-h stdio-h sys_socket-h -unistd +unistd-h configure.ac: gl_NONBLOCKING_IO diff --git a/modules/nonblocking-pipe-tests b/modules/nonblocking-pipe-tests index e03332648e..f4ab7226d4 100644 --- a/modules/nonblocking-pipe-tests +++ b/modules/nonblocking-pipe-tests @@ -10,7 +10,7 @@ tests/macros.h Depends-on: stdbool-h -unistd +unistd-h nonblocking wait-process pipe-posix diff --git a/modules/nonblocking-socket-tests b/modules/nonblocking-socket-tests index bd20609807..f70ad9795c 100644 --- a/modules/nonblocking-socket-tests +++ b/modules/nonblocking-socket-tests @@ -12,7 +12,7 @@ tests/macros.h Depends-on: stdbool-h -unistd +unistd-h sys_socket-h nonblocking wait-process diff --git a/modules/nproc b/modules/nproc index 5259579427..1081f7b778 100644 --- a/modules/nproc +++ b/modules/nproc @@ -10,7 +10,7 @@ Depends-on: c-ctype extensions minmax -unistd +unistd-h configure.ac: gl_NPROC diff --git a/modules/openat-h b/modules/openat-h index e2b58ddbb3..61b3a998fd 100644 --- a/modules/openat-h +++ b/modules/openat-h @@ -9,7 +9,7 @@ extern-inline fcntl-h stdbool-h sys_stat-h -unistd +unistd-h configure.ac: diff --git a/modules/opendir b/modules/opendir index 17df7ad399..b9a6dfe2d7 100644 --- a/modules/opendir +++ b/modules/opendir @@ -10,7 +10,7 @@ Depends-on: dirent-h largefile filename [test $HAVE_OPENDIR = 0 || test $REPLACE_OPENDIR = 1] -unistd [test $HAVE_OPENDIR = 0 || test $REPLACE_OPENDIR = 1] +unistd-h [test $HAVE_OPENDIR = 0 || test $REPLACE_OPENDIR = 1] closedir [test $HAVE_OPENDIR = 0 || test $REPLACE_OPENDIR = 1] dirfd [test $HAVE_OPENDIR = 0 || test $REPLACE_OPENDIR = 1] diff --git a/modules/pagealign_alloc b/modules/pagealign_alloc index edc7422c4b..59afe866de 100644 --- a/modules/pagealign_alloc +++ b/modules/pagealign_alloc @@ -16,7 +16,7 @@ gnulib-i18n open stdlib-h xalloc -unistd +unistd-h configure.ac: gl_PAGEALIGN_ALLOC diff --git a/modules/pathmax b/modules/pathmax index 27ca4908f9..be1ebdcbbd 100644 --- a/modules/pathmax +++ b/modules/pathmax @@ -6,7 +6,7 @@ lib/pathmax.h m4/pathmax.m4 Depends-on: -unistd +unistd-h configure.ac: gl_PATHMAX diff --git a/modules/physmem b/modules/physmem index e1a4a76700..0a9acb007d 100644 --- a/modules/physmem +++ b/modules/physmem @@ -7,7 +7,7 @@ lib/physmem.c m4/physmem.m4 Depends-on: -unistd +unistd-h full-read configure.ac: diff --git a/modules/pipe-filter-gi b/modules/pipe-filter-gi index 6841bdd7e0..6799276b49 100644 --- a/modules/pipe-filter-gi +++ b/modules/pipe-filter-gi @@ -20,7 +20,7 @@ stdbool-h stdint-h stdlib-h sys_select-h -unistd +unistd-h xalloc configure.ac: diff --git a/modules/pipe-filter-ii b/modules/pipe-filter-ii index c01d406f8c..ce911331a0 100644 --- a/modules/pipe-filter-ii +++ b/modules/pipe-filter-ii @@ -19,7 +19,7 @@ stdbool-h stdint-h stdlib-h sys_select-h -unistd +unistd-h configure.ac: AC_CHECK_FUNCS_ONCE([select]) diff --git a/modules/pipe-posix b/modules/pipe-posix index aaf19c2bf1..20f24a66a4 100644 --- a/modules/pipe-posix +++ b/modules/pipe-posix @@ -6,7 +6,7 @@ lib/pipe.c m4/pipe.m4 Depends-on: -unistd +unistd-h configure.ac: gl_FUNC_PIPE diff --git a/modules/pipe2 b/modules/pipe2 index a933d626f0..d77988a964 100644 --- a/modules/pipe2 +++ b/modules/pipe2 @@ -6,7 +6,7 @@ lib/pipe2.c m4/pipe2.m4 Depends-on: -unistd +unistd-h fcntl-h binary-io extensions diff --git a/modules/posix_spawn-internal b/modules/posix_spawn-internal index 192e765dcb..8940a4b1ab 100644 --- a/modules/posix_spawn-internal +++ b/modules/posix_spawn-internal @@ -14,7 +14,7 @@ errno-h open sh-filename strchrnul -unistd +unistd-h filename [test $HAVE_POSIX_SPAWN = 0] concat-filename [test $HAVE_POSIX_SPAWN = 0] findprog-in [test $HAVE_POSIX_SPAWN = 0] diff --git a/modules/posix_spawn-tests b/modules/posix_spawn-tests index 84c1e560b3..801b42658e 100644 --- a/modules/posix_spawn-tests +++ b/modules/posix_spawn-tests @@ -15,7 +15,7 @@ posix_spawn_file_actions_init posix_spawn_file_actions_addopen posix_spawn_file_actions_destroy stdbool-h -unistd +unistd-h sys_wait-h environ fflush diff --git a/modules/posix_spawnp-tests b/modules/posix_spawnp-tests index c335046422..dddf6478a0 100644 --- a/modules/posix_spawnp-tests +++ b/modules/posix_spawnp-tests @@ -21,7 +21,7 @@ posix_spawnattr_setsigmask posix_spawnattr_setflags posix_spawnattr_destroy stdbool-h -unistd +unistd-h sys_wait-h dup environ diff --git a/modules/posixcheck b/modules/posixcheck index a7fd34fa0e..ba980e6243 100644 --- a/modules/posixcheck +++ b/modules/posixcheck @@ -47,7 +47,7 @@ termios-h threads-h time-h uchar-h -unistd +unistd-h utime-h utmp wchar diff --git a/modules/pread b/modules/pread index 3494cd8d9e..2d9be14888 100644 --- a/modules/pread +++ b/modules/pread @@ -6,7 +6,7 @@ lib/pread.c m4/pread.m4 Depends-on: -unistd +unistd-h extensions largefile lseek [test $HAVE_PREAD = 0 || test $REPLACE_PREAD = 1] diff --git a/modules/pselect-tests b/modules/pselect-tests index c90a5d12cd..298fbb5561 100644 --- a/modules/pselect-tests +++ b/modules/pselect-tests @@ -8,7 +8,7 @@ Depends-on: stdbool-h netinet_in-h arpa_inet-h -unistd +unistd-h sys_ioctl-h extensions inet_pton diff --git a/modules/pwrite b/modules/pwrite index 78e602f0e9..53aedb7696 100644 --- a/modules/pwrite +++ b/modules/pwrite @@ -6,7 +6,7 @@ lib/pwrite.c m4/pwrite.m4 Depends-on: -unistd +unistd-h extensions largefile lseek [test $HAVE_PWRITE = 0 || test $REPLACE_PWRITE = 1] diff --git a/modules/raise-tests b/modules/raise-tests index 4804cad38d..93a6b99a37 100644 --- a/modules/raise-tests +++ b/modules/raise-tests @@ -4,7 +4,7 @@ tests/signature.h tests/macros.h Depends-on: -unistd +unistd-h configure.ac: diff --git a/modules/read b/modules/read index 494506559c..d0b601a3c2 100644 --- a/modules/read +++ b/modules/read @@ -6,7 +6,7 @@ lib/read.c m4/read.m4 Depends-on: -unistd +unistd-h msvc-inval [test $REPLACE_READ = 1] msvc-nothrow [test $REPLACE_READ = 1] diff --git a/modules/readlink b/modules/readlink index 35d65bdd5d..be981c06c8 100644 --- a/modules/readlink +++ b/modules/readlink @@ -6,7 +6,7 @@ lib/readlink.c m4/readlink.m4 Depends-on: -unistd +unistd-h stat [test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1] configure.ac: diff --git a/modules/readlinkat b/modules/readlinkat index cf52690b7b..a5e2b3e213 100644 --- a/modules/readlinkat +++ b/modules/readlinkat @@ -7,7 +7,7 @@ lib/at-func.c m4/readlinkat.m4 Depends-on: -unistd +unistd-h extensions at-internal [test $HAVE_READLINKAT = 0 || test $REPLACE_READLINKAT = 1] errno-h [test $HAVE_READLINKAT = 0 || test $REPLACE_READLINKAT = 1] diff --git a/modules/relocatable-prog b/modules/relocatable-prog index 22ac5cda4f..23b0fef895 100644 --- a/modules/relocatable-prog +++ b/modules/relocatable-prog @@ -23,7 +23,7 @@ xalloc xreadlink open stdbool-h -unistd +unistd-h memcmp strdup diff --git a/modules/relocatable-prog-wrapper b/modules/relocatable-prog-wrapper index 66f385df31..bf2535933e 100644 --- a/modules/relocatable-prog-wrapper +++ b/modules/relocatable-prog-wrapper @@ -76,7 +76,7 @@ stdint-h stdlib-h string-h sys_stat-h -unistd +unistd-h xalloc-oversized configure.ac-early: diff --git a/modules/rmdir b/modules/rmdir index 66557f34b9..6789480e22 100644 --- a/modules/rmdir +++ b/modules/rmdir @@ -6,7 +6,7 @@ lib/rmdir.c m4/rmdir.m4 Depends-on: -unistd +unistd-h filename [test $REPLACE_RMDIR = 1] sys_stat-h [test $REPLACE_RMDIR = 1] diff --git a/modules/savewd b/modules/savewd index 750d7cf647..4a2c5d7cdc 100644 --- a/modules/savewd +++ b/modules/savewd @@ -19,7 +19,7 @@ raise stdbool-h stdlib-h sys_wait-h -unistd +unistd-h xalloc configure.ac: diff --git a/modules/select-tests b/modules/select-tests index f3a6ef01d2..25f493f5b2 100644 --- a/modules/select-tests +++ b/modules/select-tests @@ -13,7 +13,7 @@ stdbool-h sys_socket-h netinet_in-h arpa_inet-h -unistd +unistd-h sys_ioctl-h extensions inet_pton diff --git a/modules/selinux-at b/modules/selinux-at index b1d6e84926..84bf7e4982 100644 --- a/modules/selinux-at +++ b/modules/selinux-at @@ -17,7 +17,7 @@ filename openat-die openat-h save-cwd -unistd +unistd-h configure.ac: AC_CHECK_HEADERS([selinux/flask.h]) diff --git a/modules/setenv b/modules/setenv index 26517c0262..df5b9c014d 100644 --- a/modules/setenv +++ b/modules/setenv @@ -10,7 +10,7 @@ stdlib-h malloca [test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1] alloca-opt [test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1] malloc-posix [test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1] -unistd [test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1] +unistd-h [test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1] environ [test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1] configure.ac: diff --git a/modules/sethostname b/modules/sethostname index 1dfa64e551..33b581f58d 100644 --- a/modules/sethostname +++ b/modules/sethostname @@ -7,7 +7,7 @@ m4/sethostname.m4 m4/gethostname.m4 Depends-on: -unistd +unistd-h errno-h [test $HAVE_SETHOSTNAME = 0 || test $REPLACE_SETHOSTNAME = 1] fopen-gnu [test $HAVE_SETHOSTNAME = 0 || test $REPLACE_SETHOSTNAME = 1] diff --git a/modules/sigpipe b/modules/sigpipe index 2e67f07218..857a8cb285 100644 --- a/modules/sigpipe +++ b/modules/sigpipe @@ -17,7 +17,7 @@ raise signal-h sigprocmask stdio-h -unistd +unistd-h configure.ac: gl_SIGNAL_SIGPIPE diff --git a/modules/sleep b/modules/sleep index b733b4f2ee..716cdedaf6 100644 --- a/modules/sleep +++ b/modules/sleep @@ -6,7 +6,7 @@ lib/sleep.c m4/sleep.m4 Depends-on: -unistd +unistd-h assert-h [test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1] stdint-h [test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1] diff --git a/modules/spawn-pipe b/modules/spawn-pipe index 1e82681dfe..0ad87102e3 100644 --- a/modules/spawn-pipe +++ b/modules/spawn-pipe @@ -39,7 +39,7 @@ posix_spawnattr_setflags posix_spawnattr_destroy stdbool-h stdlib-h -unistd +unistd-h unistd-safer wait-process windows-spawn diff --git a/modules/stat-time-tests b/modules/stat-time-tests index 5107493c6e..e38fb2d19a 100644 --- a/modules/stat-time-tests +++ b/modules/stat-time-tests @@ -7,7 +7,7 @@ Depends-on: nanosleep stdckdint-h time-h -unistd +unistd-h xconcat-filename xgetcwd diff --git a/modules/stdlib-h b/modules/stdlib-h index e1fe525665..10fb93b700 100644 --- a/modules/stdlib-h +++ b/modules/stdlib-h @@ -17,7 +17,7 @@ snippet/c++defs snippet/warn-on-use snippet/_Noreturn stddef-h -unistd +unistd-h configure.ac: gl_STDLIB_H diff --git a/modules/stdopen b/modules/stdopen index 81de5765b8..e3bc75aa41 100644 --- a/modules/stdopen +++ b/modules/stdopen @@ -7,7 +7,7 @@ lib/stdopen.h Depends-on: fcntl -unistd +unistd-h configure.ac: diff --git a/modules/symlink b/modules/symlink index a54e4e2ab3..804c611eee 100644 --- a/modules/symlink +++ b/modules/symlink @@ -6,7 +6,7 @@ lib/symlink.c m4/symlink.m4 Depends-on: -unistd +unistd-h lstat [test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1] configure.ac: diff --git a/modules/symlinkat b/modules/symlinkat index 4f6ea3b9cd..797b961ee0 100644 --- a/modules/symlinkat +++ b/modules/symlinkat @@ -7,7 +7,7 @@ lib/at-func.c m4/symlinkat.m4 Depends-on: -unistd +unistd-h extensions fcntl-h [test $HAVE_SYMLINKAT = 0 || test $REPLACE_SYMLINKAT = 1] at-internal [test $HAVE_SYMLINKAT = 0] diff --git a/modules/sys_ioctl-h b/modules/sys_ioctl-h index cf99b56252..7f988b151c 100644 --- a/modules/sys_ioctl-h +++ b/modules/sys_ioctl-h @@ -10,7 +10,7 @@ gen-header include_next snippet/c++defs snippet/warn-on-use -unistd +unistd-h configure.ac: gl_SYS_IOCTL_H diff --git a/modules/system-quote-tests b/modules/system-quote-tests index 02e18e454d..7776ef8a25 100644 --- a/modules/system-quote-tests +++ b/modules/system-quote-tests @@ -9,7 +9,7 @@ tests/macros.h Depends-on: stdbool-h -unistd +unistd-h popen pclose diff --git a/modules/term-style-control-tests b/modules/term-style-control-tests index c051966a42..e6fc895e5c 100644 --- a/modules/term-style-control-tests +++ b/modules/term-style-control-tests @@ -4,7 +4,7 @@ tests/test-term-style-control-yes.c Depends-on: stdbool-h -unistd +unistd-h full-write configure.ac: diff --git a/modules/termcap-tests b/modules/termcap-tests index bbe2854580..df13cc9326 100644 --- a/modules/termcap-tests +++ b/modules/termcap-tests @@ -3,7 +3,7 @@ tests/test-termcap.c Depends-on: termcap-h -unistd +unistd-h configure.ac: diff --git a/modules/terminfo-tests b/modules/terminfo-tests index 50d7a45d74..fec31878b8 100644 --- a/modules/terminfo-tests +++ b/modules/terminfo-tests @@ -3,7 +3,7 @@ tests/test-terminfo.c Depends-on: terminfo-h -unistd +unistd-h configure.ac: diff --git a/modules/truncate b/modules/truncate index 1baee02cda..6b80e9c74f 100644 --- a/modules/truncate +++ b/modules/truncate @@ -6,7 +6,7 @@ lib/truncate.c m4/truncate.m4 Depends-on: -unistd +unistd-h sys_types-h largefile sys_stat-h diff --git a/modules/ttyname_r b/modules/ttyname_r index 6417d30395..eb9f35ec71 100644 --- a/modules/ttyname_r +++ b/modules/ttyname_r @@ -6,7 +6,7 @@ lib/ttyname_r.c m4/ttyname_r.m4 Depends-on: -unistd +unistd-h extensions configure.ac: diff --git a/modules/unistd b/modules/unistd index af7fda5944..20cef458f7 100644 --- a/modules/unistd +++ b/modules/unistd @@ -1,243 +1,20 @@ Description: A GNU-like . +Status: +deprecated + +Notice: +This module is deprecated. Use the module 'unistd-h' instead. + Files: -m4/unistd_h.m4 -lib/unistd.c -lib/unistd.in.h -m4/off_t.m4 -m4/pid_t.m4 Depends-on: -extern-inline -gen-header -include_next -snippet/arg-nonnull -snippet/c++defs -snippet/warn-on-use -ssize_t -stddef-h -sys_types-h +unistd-h configure.ac: -gl_UNISTD_H -gl_UNISTD_H_REQUIRE_DEFAULTS -AC_PROG_MKDIR_P Makefile.am: -BUILT_SOURCES += unistd.h -lib_SOURCES += unistd.c - -# We need the following in order to create an empty placeholder for -# when the system doesn't have one. -unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) -@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' - $(gl_V_at)$(SED_HEADER_STDOUT) \ - -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ - -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ - -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ - -e 's/@''GNULIB_ACCESS''@/$(GNULIB_ACCESS)/g' \ - -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \ - -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \ - -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ - -e 's/@''GNULIB_COPY_FILE_RANGE''@/$(GNULIB_COPY_FILE_RANGE)/g' \ - -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \ - -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \ - -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \ - -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \ - -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \ - -e 's/@''GNULIB_EXECL''@/$(GNULIB_EXECL)/g' \ - -e 's/@''GNULIB_EXECLE''@/$(GNULIB_EXECLE)/g' \ - -e 's/@''GNULIB_EXECLP''@/$(GNULIB_EXECLP)/g' \ - -e 's/@''GNULIB_EXECV''@/$(GNULIB_EXECV)/g' \ - -e 's/@''GNULIB_EXECVE''@/$(GNULIB_EXECVE)/g' \ - -e 's/@''GNULIB_EXECVP''@/$(GNULIB_EXECVP)/g' \ - -e 's/@''GNULIB_EXECVPE''@/$(GNULIB_EXECVPE)/g' \ - -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \ - -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \ - -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \ - -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \ - -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \ - -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \ - < $(srcdir)/unistd.in.h > $@-t1 - $(AM_V_at)sed \ - -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \ - -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \ - -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \ - -e 's/@''GNULIB_GETENTROPY''@/$(GNULIB_GETENTROPY)/g' \ - -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \ - -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \ - -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \ - -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \ - -e 's/@''GNULIB_GETOPT_POSIX''@/$(GNULIB_GETOPT_POSIX)/g' \ - -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ - -e 's/@''GNULIB_GETPASS''@/$(GNULIB_GETPASS)/g' \ - -e 's/@''GNULIB_GETPASS_GNU''@/$(GNULIB_GETPASS_GNU)/g' \ - -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ - -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \ - -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \ - -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \ - -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \ - -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \ - -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \ - -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \ - -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \ - -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \ - -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \ - -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \ - -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \ - -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \ - -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \ - -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \ - -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ - -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ - -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ - -e 's/@''GNULIB_TRUNCATE''@/$(GNULIB_TRUNCATE)/g' \ - -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ - -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_UNISTD_H_GETOPT)/g' \ - -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ - -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \ - -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \ - -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \ - -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \ - -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \ - -e 's/@''GNULIB_MDA_ACCESS''@/$(GNULIB_MDA_ACCESS)/g' \ - -e 's/@''GNULIB_MDA_CHDIR''@/$(GNULIB_MDA_CHDIR)/g' \ - -e 's/@''GNULIB_MDA_CLOSE''@/$(GNULIB_MDA_CLOSE)/g' \ - -e 's/@''GNULIB_MDA_DUP''@/$(GNULIB_MDA_DUP)/g' \ - -e 's/@''GNULIB_MDA_DUP2''@/$(GNULIB_MDA_DUP2)/g' \ - -e 's/@''GNULIB_MDA_EXECL''@/$(GNULIB_MDA_EXECL)/g' \ - -e 's/@''GNULIB_MDA_EXECLE''@/$(GNULIB_MDA_EXECLE)/g' \ - -e 's/@''GNULIB_MDA_EXECLP''@/$(GNULIB_MDA_EXECLP)/g' \ - -e 's/@''GNULIB_MDA_EXECV''@/$(GNULIB_MDA_EXECV)/g' \ - -e 's/@''GNULIB_MDA_EXECVE''@/$(GNULIB_MDA_EXECVE)/g' \ - -e 's/@''GNULIB_MDA_EXECVP''@/$(GNULIB_MDA_EXECVP)/g' \ - -e 's/@''GNULIB_MDA_EXECVPE''@/$(GNULIB_MDA_EXECVPE)/g' \ - -e 's/@''GNULIB_MDA_GETCWD''@/$(GNULIB_MDA_GETCWD)/g' \ - -e 's/@''GNULIB_MDA_GETPID''@/$(GNULIB_MDA_GETPID)/g' \ - -e 's/@''GNULIB_MDA_ISATTY''@/$(GNULIB_MDA_ISATTY)/g' \ - -e 's/@''GNULIB_MDA_LSEEK''@/$(GNULIB_MDA_LSEEK)/g' \ - -e 's/@''GNULIB_MDA_READ''@/$(GNULIB_MDA_READ)/g' \ - -e 's/@''GNULIB_MDA_RMDIR''@/$(GNULIB_MDA_RMDIR)/g' \ - -e 's/@''GNULIB_MDA_SWAB''@/$(GNULIB_MDA_SWAB)/g' \ - -e 's/@''GNULIB_MDA_UNLINK''@/$(GNULIB_MDA_UNLINK)/g' \ - -e 's/@''GNULIB_MDA_WRITE''@/$(GNULIB_MDA_WRITE)/g' \ - < $@-t1 > $@-t2 - $(AM_V_at)sed \ - -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ - -e 's|@''HAVE_COPY_FILE_RANGE''@|$(HAVE_COPY_FILE_RANGE)|g' \ - -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ - -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ - -e 's|@''HAVE_EXECVPE''@|$(HAVE_EXECVPE)|g' \ - -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ - -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \ - -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ - -e 's|@''HAVE_FDATASYNC''@|$(HAVE_FDATASYNC)|g' \ - -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ - -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ - -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ - -e 's|@''HAVE_GETENTROPY''@|$(HAVE_GETENTROPY)|g' \ - -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ - -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ - -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ - -e 's|@''HAVE_GETPASS''@|$(HAVE_GETPASS)|g' \ - -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \ - -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ - -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ - -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ - -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \ - -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ - -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \ - -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \ - -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ - -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ - -e 's|@''HAVE_SETHOSTNAME''@|$(HAVE_SETHOSTNAME)|g' \ - -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ - -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ - -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ - -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ - -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ - -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ - -e 's|@''HAVE_DECL_EXECVPE''@|$(HAVE_DECL_EXECVPE)|g' \ - -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \ - -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \ - -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \ - -e 's|@''HAVE_DECL_GETLOGIN''@|$(HAVE_DECL_GETLOGIN)|g' \ - -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ - -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \ - -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \ - -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \ - -e 's|@''HAVE_DECL_TRUNCATE''@|$(HAVE_DECL_TRUNCATE)|g' \ - -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \ - -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ - -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ - < $@-t2 > $@-t3 - $(AM_V_at)sed \ - -e 's|@''REPLACE_ACCESS''@|$(REPLACE_ACCESS)|g' \ - -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ - -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ - -e 's|@''REPLACE_COPY_FILE_RANGE''@|$(REPLACE_COPY_FILE_RANGE)|g' \ - -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ - -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ - -e 's|@''REPLACE_DUP3''@|$(REPLACE_DUP3)|g' \ - -e 's|@''REPLACE_EXECL''@|$(REPLACE_EXECL)|g' \ - -e 's|@''REPLACE_EXECLE''@|$(REPLACE_EXECLE)|g' \ - -e 's|@''REPLACE_EXECLP''@|$(REPLACE_EXECLP)|g' \ - -e 's|@''REPLACE_EXECV''@|$(REPLACE_EXECV)|g' \ - -e 's|@''REPLACE_EXECVE''@|$(REPLACE_EXECVE)|g' \ - -e 's|@''REPLACE_EXECVP''@|$(REPLACE_EXECVP)|g' \ - -e 's|@''REPLACE_EXECVPE''@|$(REPLACE_EXECVPE)|g' \ - -e 's|@''REPLACE_FACCESSAT''@|$(REPLACE_FACCESSAT)|g' \ - -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ - -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ - -e 's|@''REPLACE_FDATASYNC''@|$(REPLACE_FDATASYNC)|g' \ - -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \ - -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ - -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \ - -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \ - -e 's|@''REPLACE_GETENTROPY''@|$(REPLACE_GETENTROPY)|g' \ - -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ - -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ - -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ - -e 's|@''REPLACE_GETPASS''@|$(REPLACE_GETPASS)|g' \ - -e 's|@''REPLACE_GETPASS_FOR_GETPASS_GNU''@|$(REPLACE_GETPASS_FOR_GETPASS_GNU)|g' \ - -e 's|@''REPLACE_GETUSERSHELL''@|$(REPLACE_GETUSERSHELL)|g' \ - -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \ - -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ - -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ - -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \ - -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ - -e 's|@''REPLACE_PIPE2''@|$(REPLACE_PIPE2)|g' \ - -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \ - -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \ - -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \ - -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ - -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \ - -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ - -e 's|@''REPLACE_SETHOSTNAME''@|$(REPLACE_SETHOSTNAME)|g' \ - -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ - -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ - -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \ - -e 's|@''REPLACE_TRUNCATE''@|$(REPLACE_TRUNCATE)|g' \ - -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \ - -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ - -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ - -e 's|@''REPLACE_USLEEP''@|$(REPLACE_USLEEP)|g' \ - -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ - -e 's|@''UNISTD_H_HAVE_SYS_RANDOM_H''@|$(UNISTD_H_HAVE_SYS_RANDOM_H)|g' \ - -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ - -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $@-t3 > $@-t4 - $(AM_V_at)rm -f $@-t1 $@-t2 $@-t3 - $(AM_V_at)mv $@-t4 $@ -MOSTLYCLEANFILES += unistd.h unistd.h-t1 unistd.h-t2 unistd.h-t3 unistd.h-t4 Include: @@ -246,4 +23,3 @@ License: LGPLv2+ Maintainer: -all diff --git a/modules/unistd-c++-tests b/modules/unistd-c++-tests deleted file mode 100644 index 7a82baa22a..0000000000 --- a/modules/unistd-c++-tests +++ /dev/null @@ -1,19 +0,0 @@ -Files: -tests/test-unistd-c++.cc -tests/signature.h - -Status: -c++-test - -Depends-on: -ansi-c++-opt - -configure.ac: - -Makefile.am: -if ANSICXX -TESTS += test-unistd-c++ -check_PROGRAMS += test-unistd-c++ -test_unistd_c___SOURCES = test-unistd-c++.cc -test_unistd_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN) $(LIBSOCKET) $(GETLOGIN_LIB) $(GETRANDOM_LIB) -endif diff --git a/modules/unistd-h b/modules/unistd-h new file mode 100644 index 0000000000..af7fda5944 --- /dev/null +++ b/modules/unistd-h @@ -0,0 +1,249 @@ +Description: +A GNU-like . + +Files: +m4/unistd_h.m4 +lib/unistd.c +lib/unistd.in.h +m4/off_t.m4 +m4/pid_t.m4 + +Depends-on: +extern-inline +gen-header +include_next +snippet/arg-nonnull +snippet/c++defs +snippet/warn-on-use +ssize_t +stddef-h +sys_types-h + +configure.ac: +gl_UNISTD_H +gl_UNISTD_H_REQUIRE_DEFAULTS +AC_PROG_MKDIR_P + +Makefile.am: +BUILT_SOURCES += unistd.h +lib_SOURCES += unistd.c + +# We need the following in order to create an empty placeholder for +# when the system doesn't have one. +unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@NMD@ $(AM_V_GEN)$(MKDIR_P) '%reldir%' + $(gl_V_at)$(SED_HEADER_STDOUT) \ + -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \ + -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ + -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ + -e 's/@''GNULIB_ACCESS''@/$(GNULIB_ACCESS)/g' \ + -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \ + -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \ + -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ + -e 's/@''GNULIB_COPY_FILE_RANGE''@/$(GNULIB_COPY_FILE_RANGE)/g' \ + -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \ + -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \ + -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \ + -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \ + -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \ + -e 's/@''GNULIB_EXECL''@/$(GNULIB_EXECL)/g' \ + -e 's/@''GNULIB_EXECLE''@/$(GNULIB_EXECLE)/g' \ + -e 's/@''GNULIB_EXECLP''@/$(GNULIB_EXECLP)/g' \ + -e 's/@''GNULIB_EXECV''@/$(GNULIB_EXECV)/g' \ + -e 's/@''GNULIB_EXECVE''@/$(GNULIB_EXECVE)/g' \ + -e 's/@''GNULIB_EXECVP''@/$(GNULIB_EXECVP)/g' \ + -e 's/@''GNULIB_EXECVPE''@/$(GNULIB_EXECVPE)/g' \ + -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \ + -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \ + -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \ + -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \ + -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \ + -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \ + < $(srcdir)/unistd.in.h > $@-t1 + $(AM_V_at)sed \ + -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \ + -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \ + -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \ + -e 's/@''GNULIB_GETENTROPY''@/$(GNULIB_GETENTROPY)/g' \ + -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \ + -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \ + -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \ + -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \ + -e 's/@''GNULIB_GETOPT_POSIX''@/$(GNULIB_GETOPT_POSIX)/g' \ + -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ + -e 's/@''GNULIB_GETPASS''@/$(GNULIB_GETPASS)/g' \ + -e 's/@''GNULIB_GETPASS_GNU''@/$(GNULIB_GETPASS_GNU)/g' \ + -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ + -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \ + -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \ + -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \ + -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \ + -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \ + -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \ + -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \ + -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \ + -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \ + -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \ + -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \ + -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \ + -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \ + -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \ + -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \ + -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ + -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ + -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ + -e 's/@''GNULIB_TRUNCATE''@/$(GNULIB_TRUNCATE)/g' \ + -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ + -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_UNISTD_H_GETOPT)/g' \ + -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ + -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \ + -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \ + -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \ + -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \ + -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \ + -e 's/@''GNULIB_MDA_ACCESS''@/$(GNULIB_MDA_ACCESS)/g' \ + -e 's/@''GNULIB_MDA_CHDIR''@/$(GNULIB_MDA_CHDIR)/g' \ + -e 's/@''GNULIB_MDA_CLOSE''@/$(GNULIB_MDA_CLOSE)/g' \ + -e 's/@''GNULIB_MDA_DUP''@/$(GNULIB_MDA_DUP)/g' \ + -e 's/@''GNULIB_MDA_DUP2''@/$(GNULIB_MDA_DUP2)/g' \ + -e 's/@''GNULIB_MDA_EXECL''@/$(GNULIB_MDA_EXECL)/g' \ + -e 's/@''GNULIB_MDA_EXECLE''@/$(GNULIB_MDA_EXECLE)/g' \ + -e 's/@''GNULIB_MDA_EXECLP''@/$(GNULIB_MDA_EXECLP)/g' \ + -e 's/@''GNULIB_MDA_EXECV''@/$(GNULIB_MDA_EXECV)/g' \ + -e 's/@''GNULIB_MDA_EXECVE''@/$(GNULIB_MDA_EXECVE)/g' \ + -e 's/@''GNULIB_MDA_EXECVP''@/$(GNULIB_MDA_EXECVP)/g' \ + -e 's/@''GNULIB_MDA_EXECVPE''@/$(GNULIB_MDA_EXECVPE)/g' \ + -e 's/@''GNULIB_MDA_GETCWD''@/$(GNULIB_MDA_GETCWD)/g' \ + -e 's/@''GNULIB_MDA_GETPID''@/$(GNULIB_MDA_GETPID)/g' \ + -e 's/@''GNULIB_MDA_ISATTY''@/$(GNULIB_MDA_ISATTY)/g' \ + -e 's/@''GNULIB_MDA_LSEEK''@/$(GNULIB_MDA_LSEEK)/g' \ + -e 's/@''GNULIB_MDA_READ''@/$(GNULIB_MDA_READ)/g' \ + -e 's/@''GNULIB_MDA_RMDIR''@/$(GNULIB_MDA_RMDIR)/g' \ + -e 's/@''GNULIB_MDA_SWAB''@/$(GNULIB_MDA_SWAB)/g' \ + -e 's/@''GNULIB_MDA_UNLINK''@/$(GNULIB_MDA_UNLINK)/g' \ + -e 's/@''GNULIB_MDA_WRITE''@/$(GNULIB_MDA_WRITE)/g' \ + < $@-t1 > $@-t2 + $(AM_V_at)sed \ + -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ + -e 's|@''HAVE_COPY_FILE_RANGE''@|$(HAVE_COPY_FILE_RANGE)|g' \ + -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ + -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ + -e 's|@''HAVE_EXECVPE''@|$(HAVE_EXECVPE)|g' \ + -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ + -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \ + -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ + -e 's|@''HAVE_FDATASYNC''@|$(HAVE_FDATASYNC)|g' \ + -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ + -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ + -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ + -e 's|@''HAVE_GETENTROPY''@|$(HAVE_GETENTROPY)|g' \ + -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ + -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ + -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ + -e 's|@''HAVE_GETPASS''@|$(HAVE_GETPASS)|g' \ + -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \ + -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ + -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ + -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ + -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \ + -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ + -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \ + -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \ + -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ + -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ + -e 's|@''HAVE_SETHOSTNAME''@|$(HAVE_SETHOSTNAME)|g' \ + -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ + -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ + -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ + -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ + -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ + -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ + -e 's|@''HAVE_DECL_EXECVPE''@|$(HAVE_DECL_EXECVPE)|g' \ + -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \ + -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \ + -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \ + -e 's|@''HAVE_DECL_GETLOGIN''@|$(HAVE_DECL_GETLOGIN)|g' \ + -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ + -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \ + -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \ + -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \ + -e 's|@''HAVE_DECL_TRUNCATE''@|$(HAVE_DECL_TRUNCATE)|g' \ + -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \ + -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ + -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ + < $@-t2 > $@-t3 + $(AM_V_at)sed \ + -e 's|@''REPLACE_ACCESS''@|$(REPLACE_ACCESS)|g' \ + -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ + -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ + -e 's|@''REPLACE_COPY_FILE_RANGE''@|$(REPLACE_COPY_FILE_RANGE)|g' \ + -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ + -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ + -e 's|@''REPLACE_DUP3''@|$(REPLACE_DUP3)|g' \ + -e 's|@''REPLACE_EXECL''@|$(REPLACE_EXECL)|g' \ + -e 's|@''REPLACE_EXECLE''@|$(REPLACE_EXECLE)|g' \ + -e 's|@''REPLACE_EXECLP''@|$(REPLACE_EXECLP)|g' \ + -e 's|@''REPLACE_EXECV''@|$(REPLACE_EXECV)|g' \ + -e 's|@''REPLACE_EXECVE''@|$(REPLACE_EXECVE)|g' \ + -e 's|@''REPLACE_EXECVP''@|$(REPLACE_EXECVP)|g' \ + -e 's|@''REPLACE_EXECVPE''@|$(REPLACE_EXECVPE)|g' \ + -e 's|@''REPLACE_FACCESSAT''@|$(REPLACE_FACCESSAT)|g' \ + -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ + -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ + -e 's|@''REPLACE_FDATASYNC''@|$(REPLACE_FDATASYNC)|g' \ + -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \ + -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ + -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \ + -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \ + -e 's|@''REPLACE_GETENTROPY''@|$(REPLACE_GETENTROPY)|g' \ + -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ + -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ + -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ + -e 's|@''REPLACE_GETPASS''@|$(REPLACE_GETPASS)|g' \ + -e 's|@''REPLACE_GETPASS_FOR_GETPASS_GNU''@|$(REPLACE_GETPASS_FOR_GETPASS_GNU)|g' \ + -e 's|@''REPLACE_GETUSERSHELL''@|$(REPLACE_GETUSERSHELL)|g' \ + -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \ + -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ + -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ + -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \ + -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ + -e 's|@''REPLACE_PIPE2''@|$(REPLACE_PIPE2)|g' \ + -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \ + -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \ + -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \ + -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ + -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \ + -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ + -e 's|@''REPLACE_SETHOSTNAME''@|$(REPLACE_SETHOSTNAME)|g' \ + -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ + -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ + -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \ + -e 's|@''REPLACE_TRUNCATE''@|$(REPLACE_TRUNCATE)|g' \ + -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \ + -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ + -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ + -e 's|@''REPLACE_USLEEP''@|$(REPLACE_USLEEP)|g' \ + -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ + -e 's|@''UNISTD_H_HAVE_SYS_RANDOM_H''@|$(UNISTD_H_HAVE_SYS_RANDOM_H)|g' \ + -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ + -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + < $@-t3 > $@-t4 + $(AM_V_at)rm -f $@-t1 $@-t2 $@-t3 + $(AM_V_at)mv $@-t4 $@ +MOSTLYCLEANFILES += unistd.h unistd.h-t1 unistd.h-t2 unistd.h-t3 unistd.h-t4 + +Include: + + +License: +LGPLv2+ + +Maintainer: +all diff --git a/modules/unistd-h-c++-tests b/modules/unistd-h-c++-tests new file mode 100644 index 0000000000..a252919676 --- /dev/null +++ b/modules/unistd-h-c++-tests @@ -0,0 +1,19 @@ +Files: +tests/test-unistd-h-c++.cc +tests/signature.h + +Status: +c++-test + +Depends-on: +ansi-c++-opt + +configure.ac: + +Makefile.am: +if ANSICXX +TESTS += test-unistd-h-c++ +check_PROGRAMS += test-unistd-h-c++ +test_unistd_h_c___SOURCES = test-unistd-h-c++.cc +test_unistd_h_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN) $(LIBSOCKET) $(GETLOGIN_LIB) $(GETRANDOM_LIB) +endif diff --git a/modules/unistd-h-tests b/modules/unistd-h-tests new file mode 100644 index 0000000000..cd934ee55b --- /dev/null +++ b/modules/unistd-h-tests @@ -0,0 +1,12 @@ +Files: +tests/test-unistd-h.c + +Depends-on: +assert-h +unistd-h-c++-tests + +configure.ac: + +Makefile.am: +TESTS += test-unistd-h +check_PROGRAMS += test-unistd-h diff --git a/modules/unistd-safer b/modules/unistd-safer index 81bf2300e5..da7646831f 100644 --- a/modules/unistd-safer +++ b/modules/unistd-safer @@ -11,7 +11,7 @@ m4/unistd-safer.m4 Depends-on: fcntl -unistd +unistd-h pipe-posix configure.ac: diff --git a/modules/unistd-tests b/modules/unistd-tests deleted file mode 100644 index e9ce6e0a3d..0000000000 --- a/modules/unistd-tests +++ /dev/null @@ -1,12 +0,0 @@ -Files: -tests/test-unistd.c - -Depends-on: -assert-h -unistd-c++-tests - -configure.ac: - -Makefile.am: -TESTS += test-unistd -check_PROGRAMS += test-unistd diff --git a/modules/unlink b/modules/unlink index 119ed9faed..d9612b438f 100644 --- a/modules/unlink +++ b/modules/unlink @@ -6,7 +6,7 @@ lib/unlink.c m4/unlink.m4 Depends-on: -unistd +unistd-h filename [test $REPLACE_UNLINK = 1] lstat [test $REPLACE_UNLINK = 1] malloc-posix [test $REPLACE_UNLINK = 1] diff --git a/modules/unlinkat b/modules/unlinkat index 8bae1c2263..2e914d2fef 100644 --- a/modules/unlinkat +++ b/modules/unlinkat @@ -8,7 +8,7 @@ m4/unlinkat.m4 m4/lstat.m4 Depends-on: -unistd +unistd-h extensions fcntl-h [test $HAVE_UNLINKAT = 0 || test $REPLACE_UNLINKAT = 1] openat-h [test $HAVE_UNLINKAT = 0 || test $REPLACE_UNLINKAT = 1] diff --git a/modules/unsetenv b/modules/unsetenv index 04f906dce5..f9da07ebba 100644 --- a/modules/unsetenv +++ b/modules/unsetenv @@ -7,7 +7,7 @@ m4/setenv.m4 Depends-on: stdlib-h -unistd [test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1] +unistd-h [test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1] environ [test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1] free-posix [test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1] malloc-posix [test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1] diff --git a/modules/usleep b/modules/usleep index 1e842347fa..c22fa83a01 100644 --- a/modules/usleep +++ b/modules/usleep @@ -6,7 +6,7 @@ lib/usleep.c m4/usleep.m4 Depends-on: -unistd +unistd-h extensions sleep [test $HAVE_USLEEP = 0 || test $REPLACE_USLEEP = 1] diff --git a/modules/vma-iter b/modules/vma-iter index f41e4cd3f3..57022a33ab 100644 --- a/modules/vma-iter +++ b/modules/vma-iter @@ -8,7 +8,7 @@ m4/mmap-anon.m4 Depends-on: stdint-h -unistd +unistd-h extensions getpagesize open diff --git a/modules/wait-process b/modules/wait-process index fd7a7f132f..62efbb61a4 100644 --- a/modules/wait-process +++ b/modules/wait-process @@ -17,7 +17,7 @@ gnulib-i18n stdbool-h stdlib-h sys_wait-h -unistd +unistd-h atexit waitpid diff --git a/modules/windows-spawn b/modules/windows-spawn index a0bdde7424..296a908641 100644 --- a/modules/windows-spawn +++ b/modules/windows-spawn @@ -15,7 +15,7 @@ stdbool-h stdint-h stdlib-h strpbrk -unistd +unistd-h malloc-posix configure.ac: diff --git a/modules/write b/modules/write index f32cbc7076..f826673316 100644 --- a/modules/write +++ b/modules/write @@ -6,7 +6,7 @@ lib/write.c m4/write.m4 Depends-on: -unistd +unistd-h raise [test $REPLACE_WRITE = 1] msvc-inval [test $REPLACE_WRITE = 1] msvc-nothrow [test $REPLACE_WRITE = 1] diff --git a/modules/xnanosleep b/modules/xnanosleep index 80e6a3aa15..8affc39e76 100644 --- a/modules/xnanosleep +++ b/modules/xnanosleep @@ -12,7 +12,7 @@ dtotimespec intprops nanosleep time-h -unistd +unistd-h configure.ac: gl_XNANOSLEEP diff --git a/tests/test-unistd-c++.cc b/tests/test-unistd-h-c++.cc similarity index 100% rename from tests/test-unistd-c++.cc rename to tests/test-unistd-h-c++.cc diff --git a/tests/test-unistd.c b/tests/test-unistd-h.c similarity index 100% rename from tests/test-unistd.c rename to tests/test-unistd-h.c -- 2.39.5