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.
2025-08-08 17:22:05 +03:00 · 2024-12-27 23:41:53 +01:00
parent 29fe4ac247
commit 2a99a564a4
170 changed files with 463 additions and 425 deletions
--- a/13
+++ b/13
@@ -1,3 +1,16 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+	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  <bruno@clisp.org>

 	Rename module uchar-c23 to uchar-h-c23.
--- 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
--- 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
--- 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
--- a/modules/access
+++ b/modules/access
@@ -6,7 +6,7 @@ lib/access.c
 m4/access.m4

 Depends-on:
-unistd
+unistd-h
 fcntl
 stat

--- 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

--- 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:

--- 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])
--- 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])
--- 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:

--- 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
--- 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:
--- 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
--- 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])
--- 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])
--- 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]
--- 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]
--- 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
--- 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
--- 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]

--- a/modules/closein
+++ b/modules/closein
@@ -12,7 +12,7 @@ fflush
 gettext-h
 gnulib-i18n
 stdbool-h
-unistd
+unistd-h

 configure.ac:

--- a/modules/closeout
+++ b/modules/closeout
@@ -13,7 +13,7 @@ error
 quotearg
 exitfail
 stdbool-h
-unistd
+unistd-h

 configure.ac:

--- 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:
--- 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
--- 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
--- 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:
--- 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]

--- 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
--- a/modules/eloop-threshold
+++ b/modules/eloop-threshold
@@ -6,7 +6,7 @@ lib/eloop-threshold.h

 Depends-on:
 minmax
-unistd
+unistd-h

 configure.ac:

--- a/modules/environ
+++ b/modules/environ
@@ -5,7 +5,7 @@ Files:
 m4/environ.m4

 Depends-on:
-unistd
+unistd-h
 extensions

 configure.ac:
--- 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:
--- 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
--- 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]

--- 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]

--- 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]

--- 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
--- 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 <unistd.h>.
--- 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]

--- 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]
--- 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]

--- 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]
--- 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]
--- 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
--- 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]
--- 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]
--- 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]
--- 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
--- 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:

--- 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
--- 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:
--- 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

--- 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:
--- 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:

--- a/modules/findprog
+++ b/modules/findprog
@@ -14,7 +14,7 @@ xalloc
 xconcat-filename
 access
 stat
-unistd
+unistd-h

 configure.ac:
 gl_FINDPROG
--- 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
--- a/modules/findprog-lgpl
+++ b/modules/findprog-lgpl
@@ -15,7 +15,7 @@ strdup
 concat-filename
 access
 stat
-unistd
+unistd-h

 configure.ac:
 gl_FINDPROG
--- 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:
--- 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]

--- 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]

--- a/modules/forkpty
+++ b/modules/forkpty
@@ -8,7 +8,7 @@ m4/pty.m4

 Depends-on:
 pty-h
-unistd
+unistd-h
 openpty
 login_tty

--- 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

--- 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

--- a/modules/freadahead-tests
+++ b/modules/freadahead-tests
@@ -5,7 +5,7 @@ tests/macros.h

 Depends-on:
 lseek
-unistd
+unistd-h

 configure.ac:

--- a/modules/freadptr-tests
+++ b/modules/freadptr-tests
@@ -7,7 +7,7 @@ tests/macros.h

 Depends-on:
 lseek
-unistd
+unistd-h

 configure.ac:

--- 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:

--- 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:

--- 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]

--- 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:
--- 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]
--- 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

--- 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
--- 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
--- 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:
--- 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:
--- 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]
--- 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]

--- 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]
--- 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]

--- 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
--- 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]
--- 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]
--- 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
--- 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]
--- 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:
--- 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
--- 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:
--- 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
--- 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
--- 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]

--- 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]
--- 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:
--- 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]
--- 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:
--- 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:
--- 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]

--- 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]

--- 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:
--- a/modules/javacomp
+++ b/modules/javacomp
@@ -7,7 +7,7 @@ lib/javacomp.c

 Depends-on:
 stdbool-h
-unistd
+unistd-h
 javaversion
 execute
 spawn-pipe
--- 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
--- 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]
--- a/Show More
+++ b/Show More