Rename module netinet_in to netinet_in-h.

* modules/netinet_in-h: Renamed from modules/netinet_in.
* modules/netinet_in-h-tests: Renamed from modules/netinet_in-tests.
* modules/netinet_in-h-c++-tests: Renamed from
modules/netinet_in-c++-tests.
* tests/test-netinet_in-h.c: Renamed from tests/test-netinet_in.c.
* tests/test-netinet_in-h-c++.cc: Renamed from
tests/test-netinet_in-c++.cc.
* doc/posix-headers/netinet_in.texi: Update.
* modules/* (Depends-on): Update.
* modules/netinet_in: New file.

diff --git a/ChangeLog b/ChangeLog
index a47950f80e29b3fb5dc3139bd5ef9a1b3d355063..e5b0812b243f8fb1f89e20d9ee87fe74fc29b924 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+       Rename module netinet_in to netinet_in-h.
+       * modules/netinet_in-h: Renamed from modules/netinet_in.
+       * modules/netinet_in-h-tests: Renamed from modules/netinet_in-tests.
+       * modules/netinet_in-h-c++-tests: Renamed from
+       modules/netinet_in-c++-tests.
+       * tests/test-netinet_in-h.c: Renamed from tests/test-netinet_in.c.
+       * tests/test-netinet_in-h-c++.cc: Renamed from
+       tests/test-netinet_in-c++.cc.
+       * doc/posix-headers/netinet_in.texi: Update.
+       * modules/* (Depends-on): Update.
+       * modules/netinet_in: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>
 
        Rename module net_if to net_if-h.

diff --git a/doc/posix-headers/netinet_in.texi b/doc/posix-headers/netinet_in.texi
index 03d3811a588fb38afa19d49762789fa06329d2c4..2fc5cec7fa1163c8faac62ec165e00da7a9a4aaa 100644 (file)
--- a/doc/posix-headers/netinet_in.texi
+++ b/doc/posix-headers/netinet_in.texi
@@ -3,8 +3,8 @@
 
 POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/netinet_in.h.html}
 
-Gnulib module: netinet_in
-@mindex netinet_in
+Gnulib module: netinet_in-h
+@mindex netinet_in-h
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/modules/accept-tests b/modules/accept-tests
index a03be0abbe2c9dbe4ee6e689ae2428a24038cadc..9e1c584036af4033242d5b253ddf6d5b9d74697a 100644 (file)
--- a/modules/accept-tests
+++ b/modules/accept-tests
@@ -4,7 +4,7 @@ tests/signature.h
 tests/macros.h
 
 Depends-on:
-netinet_in
+netinet_in-h
 sockets
 
 configure.ac:

diff --git a/modules/accept4-tests b/modules/accept4-tests
index ad8f5fcd88f522027e3293dffd9a25953d41c1ec..c5319cb3498125826bf74fa3a7f92c1e3584c6a3 100644 (file)
--- a/modules/accept4-tests
+++ b/modules/accept4-tests
@@ -5,7 +5,7 @@ tests/macros.h
 
 Depends-on:
 fcntl-h
-netinet_in
+netinet_in-h
 binary-io
 sockets
 

diff --git a/modules/bind-tests b/modules/bind-tests
index 9ffb71f5b64d89e283b1c0c3c336dd25f6f5530d..3d2971e55cf772081f28ccfc6cfc72bd49c48999 100644 (file)
--- a/modules/bind-tests
+++ b/modules/bind-tests
@@ -4,7 +4,7 @@ tests/signature.h
 tests/macros.h
 
 Depends-on:
-netinet_in
+netinet_in-h
 sockets
 inet_pton
 

diff --git a/modules/connect-tests b/modules/connect-tests
index 8b3c7105e0778e16da42124491f2b7b03cb25434..b66b0b8a6a645f6ae9ef2292885a9173502a50c8 100644 (file)
--- a/modules/connect-tests
+++ b/modules/connect-tests
@@ -4,7 +4,7 @@ tests/signature.h
 tests/macros.h
 
 Depends-on:
-netinet_in
+netinet_in-h
 sockets
 inet_pton
 

diff --git a/modules/getpeername-tests b/modules/getpeername-tests
index b77f58ad1e31f86539e2b037be108aec7aecbb49..15e834de080f4a38f1e49a2ac1bc7e8813f8c5ec 100644 (file)
--- a/modules/getpeername-tests
+++ b/modules/getpeername-tests
@@ -4,7 +4,7 @@ tests/signature.h
 tests/macros.h
 
 Depends-on:
-netinet_in
+netinet_in-h
 sockets
 
 configure.ac:

diff --git a/modules/getsockname-tests b/modules/getsockname-tests
index cfa326732eadb8fa9ca7caaaa9ada420e339d4ea..7599ad0149875c791855c5f2bd159d471c8286df 100644 (file)
--- a/modules/getsockname-tests
+++ b/modules/getsockname-tests
@@ -4,7 +4,7 @@ tests/signature.h
 tests/macros.h
 
 Depends-on:
-netinet_in
+netinet_in-h
 arpa_inet-h
 inet_pton
 errno-h

diff --git a/modules/getsockopt-tests b/modules/getsockopt-tests
index c6e5c16def93e7e523eeb6f4ea986532479896f1..25cc1909c7b703e5b9f5e21b24c0863489d9a7cc 100644 (file)
--- a/modules/getsockopt-tests
+++ b/modules/getsockopt-tests
@@ -4,7 +4,7 @@ tests/signature.h
 tests/macros.h
 
 Depends-on:
-netinet_in
+netinet_in-h
 sockets
 
 configure.ac:

diff --git a/modules/inet_ntop b/modules/inet_ntop
index c5b63311e4b69979aa0b8fc90a3d568bc98f5458..d83f742a0b148de391ca07d4676e98af7b7ef921 100644 (file)
--- a/modules/inet_ntop
+++ b/modules/inet_ntop
@@ -11,7 +11,7 @@ arpa_inet-h
 extensions
 sys_socket      [test $HAVE_INET_NTOP = 0 || test $REPLACE_INET_NTOP = 1]
 errno-h         [test $HAVE_INET_NTOP = 0 || test $REPLACE_INET_NTOP = 1]
-netinet_in      [test $HAVE_INET_NTOP = 0 || test $REPLACE_INET_NTOP = 1]
+netinet_in-h    [test $HAVE_INET_NTOP = 0 || test $REPLACE_INET_NTOP = 1]
 
 configure.ac:
 gl_FUNC_INET_NTOP

diff --git a/modules/inet_ntop-tests b/modules/inet_ntop-tests
index cab3d51a634ff5dfb562b70b774660f00325eeb7..62b42175c8a585e23d617e69f61142e92d27c409 100644 (file)
--- a/modules/inet_ntop-tests
+++ b/modules/inet_ntop-tests
@@ -4,7 +4,7 @@ tests/signature.h
 tests/macros.h
 
 Depends-on:
-netinet_in
+netinet_in-h
 sys_socket
 
 configure.ac:

diff --git a/modules/inet_pton b/modules/inet_pton
index e36d6d031a14ec02d79d3ab09bfc5791e8003d75..b09fc558cf061a6430bec8f816bd11d9fff60263 100644 (file)
--- a/modules/inet_pton
+++ b/modules/inet_pton
@@ -11,7 +11,7 @@ extensions
 c-ctype         [test $HAVE_INET_PTON = 0 || test $REPLACE_INET_PTON = 1]
 sys_socket      [test $HAVE_INET_PTON = 0 || test $REPLACE_INET_PTON = 1]
 errno-h         [test $HAVE_INET_PTON = 0 || test $REPLACE_INET_PTON = 1]
-netinet_in      [test $HAVE_INET_PTON = 0 || test $REPLACE_INET_PTON = 1]
+netinet_in-h    [test $HAVE_INET_PTON = 0 || test $REPLACE_INET_PTON = 1]
 
 configure.ac:
 gl_FUNC_INET_PTON

diff --git a/modules/inet_pton-tests b/modules/inet_pton-tests
index cc7408a6db72e26981fc0c4a12468ad2665cbeb9..4e65e3816c870a1c9bfb7a1a32702f43d910f139 100644 (file)
--- a/modules/inet_pton-tests
+++ b/modules/inet_pton-tests
@@ -4,7 +4,7 @@ tests/signature.h
 tests/macros.h
 
 Depends-on:
-netinet_in
+netinet_in-h
 sys_socket
 
 configure.ac:

diff --git a/modules/netinet_in b/modules/netinet_in
index 8a51447c62d21b95ffc7064a44b578be59dc710b..d4f2da02b14cc66dd5c7847498d535d0e40aef33 100644 (file)
--- a/modules/netinet_in
+++ b/modules/netinet_in
@@ -1,43 +1,20 @@
 Description:
 A <netinet/in.h> for systems lacking it.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'netinet_in-h' instead.
+
 Files:
-lib/netinet_in.in.h
-m4/netinet_in_h.m4
 
 Depends-on:
-gen-header
-include_next
-sys_socket
+netinet_in-h
 
 configure.ac:
-gl_HEADER_NETINET_IN
-gl_CONDITIONAL_HEADER([netinet/in.h])
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += $(NETINET_IN_H)
-
-# We need the following in order to create <netinet/in.h> when the system
-# doesn't have one.
-if GL_GENERATE_NETINET_IN_H
-netinet/in.h: netinet_in.in.h $(top_builddir)/config.status
-       $(AM_V_GEN)$(MKDIR_P) '%reldir%/netinet'
-       $(AM_V_at)$(SED_HEADER_STDOUT) \
-             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|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_NETINET_IN_H''@|$(NEXT_NETINET_IN_H)|g' \
-             -e 's|@''HAVE_NETINET_IN_H''@|$(HAVE_NETINET_IN_H)|g' \
-             $(srcdir)/netinet_in.in.h > $@-t
-       $(AM_V_at)mv $@-t $@
-else
-netinet/in.h: $(top_builddir)/config.status
-       rm -f $@
-endif
-MOSTLYCLEANFILES += netinet/in.h netinet/in.h-t
-MOSTLYCLEANDIRS += netinet
 
 Include:
 <netinet/in.h>
@@ -46,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-Simon Josefsson

diff --git a/modules/netinet_in-c++-tests b/modules/netinet_in-c++-tests
deleted file mode 100644 (file)
index c84cba5..0000000
--- a/modules/netinet_in-c++-tests
+++ /dev/null
@@ -1,17 +0,0 @@
-Files:
-tests/test-netinet_in-c++.cc
-
-Status:
-c++-test
-
-Depends-on:
-ansi-c++-opt
-
-configure.ac:
-
-Makefile.am:
-if ANSICXX
-TESTS += test-netinet_in-c++
-check_PROGRAMS += test-netinet_in-c++
-test_netinet_in_c___SOURCES = test-netinet_in-c++.cc
-endif

diff --git a/modules/netinet_in-h b/modules/netinet_in-h
new file mode 100644 (file)
index 0000000..8a51447
--- /dev/null
+++ b/modules/netinet_in-h
@@ -0,0 +1,49 @@
+Description:
+A <netinet/in.h> for systems lacking it.
+
+Files:
+lib/netinet_in.in.h
+m4/netinet_in_h.m4
+
+Depends-on:
+gen-header
+include_next
+sys_socket
+
+configure.ac:
+gl_HEADER_NETINET_IN
+gl_CONDITIONAL_HEADER([netinet/in.h])
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += $(NETINET_IN_H)
+
+# We need the following in order to create <netinet/in.h> when the system
+# doesn't have one.
+if GL_GENERATE_NETINET_IN_H
+netinet/in.h: netinet_in.in.h $(top_builddir)/config.status
+       $(AM_V_GEN)$(MKDIR_P) '%reldir%/netinet'
+       $(AM_V_at)$(SED_HEADER_STDOUT) \
+             -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|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_NETINET_IN_H''@|$(NEXT_NETINET_IN_H)|g' \
+             -e 's|@''HAVE_NETINET_IN_H''@|$(HAVE_NETINET_IN_H)|g' \
+             $(srcdir)/netinet_in.in.h > $@-t
+       $(AM_V_at)mv $@-t $@
+else
+netinet/in.h: $(top_builddir)/config.status
+       rm -f $@
+endif
+MOSTLYCLEANFILES += netinet/in.h netinet/in.h-t
+MOSTLYCLEANDIRS += netinet
+
+Include:
+<netinet/in.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+Simon Josefsson

diff --git a/modules/netinet_in-h-c++-tests b/modules/netinet_in-h-c++-tests
new file mode 100644 (file)
index 0000000..24e927c
--- /dev/null
+++ b/modules/netinet_in-h-c++-tests
@@ -0,0 +1,17 @@
+Files:
+tests/test-netinet_in-h-c++.cc
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-netinet_in-h-c++
+check_PROGRAMS += test-netinet_in-h-c++
+test_netinet_in_h_c___SOURCES = test-netinet_in-h-c++.cc
+endif

diff --git a/modules/netinet_in-h-tests b/modules/netinet_in-h-tests
new file mode 100644 (file)
index 0000000..6b883da
--- /dev/null
+++ b/modules/netinet_in-h-tests
@@ -0,0 +1,11 @@
+Files:
+tests/test-netinet_in-h.c
+
+Depends-on:
+netinet_in-h-c++-tests
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-netinet_in-h
+check_PROGRAMS += test-netinet_in-h

diff --git a/modules/netinet_in-tests b/modules/netinet_in-tests
deleted file mode 100644 (file)
index c68cfbf..0000000
--- a/modules/netinet_in-tests
+++ /dev/null
@@ -1,11 +0,0 @@
-Files:
-tests/test-netinet_in.c
-
-Depends-on:
-netinet_in-c++-tests
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-netinet_in
-check_PROGRAMS += test-netinet_in

diff --git a/modules/nonblocking-socket-tests b/modules/nonblocking-socket-tests
index 526dd541b5652357cd0dd66369915383b542c003..56e85486e6d63ba7b8914d4e1eb0bd4596a1b2e5 100644 (file)
--- a/modules/nonblocking-socket-tests
+++ b/modules/nonblocking-socket-tests
@@ -18,7 +18,7 @@ nonblocking
 wait-process
 environ
 posix_spawnp
-netinet_in
+netinet_in-h
 arpa_inet-h
 socket
 setsockopt

diff --git a/modules/poll-tests b/modules/poll-tests
index fc9d6c280643133aec91bfea9698922a08e29fd3..35df84b8f795fb615bcdf7573fe45953cd82189f 100644 (file)
--- a/modules/poll-tests
+++ b/modules/poll-tests
@@ -6,7 +6,7 @@ tests/macros.h
 Depends-on:
 stdbool
 sys_socket
-netinet_in
+netinet_in-h
 arpa_inet-h
 sys_ioctl
 extensions

diff --git a/modules/pselect-tests b/modules/pselect-tests
index c7786d3c943eeea87d991a6ddfe9d45841d1a16a..bdadf6b68906ef3f360e9d83440116d088476fd6 100644 (file)
--- a/modules/pselect-tests
+++ b/modules/pselect-tests
@@ -6,7 +6,7 @@ tests/signature.h
 
 Depends-on:
 stdbool
-netinet_in
+netinet_in-h
 arpa_inet-h
 unistd
 sys_ioctl

diff --git a/modules/recvfrom-tests b/modules/recvfrom-tests
index ac209427fc46a66797f8e563b849248fc1212a18..7481eaa442a3c750cb9bdfd0419150f603fb56ee 100644 (file)
--- a/modules/recvfrom-tests
+++ b/modules/recvfrom-tests
@@ -4,7 +4,7 @@ tests/signature.h
 tests/macros.h
 
 Depends-on:
-netinet_in
+netinet_in-h
 sockets
 
 configure.ac:

diff --git a/modules/select-tests b/modules/select-tests
index 822ee30e4569b41e58ed490a0b6477552af1eab9..844f31eb50a84ec317bc26bb41c7ce14cc30e678 100644 (file)
--- a/modules/select-tests
+++ b/modules/select-tests
@@ -11,7 +11,7 @@ tests/test-select-stdin.c
 Depends-on:
 stdbool
 sys_socket
-netinet_in
+netinet_in-h
 arpa_inet-h
 unistd
 sys_ioctl

diff --git a/modules/sendto-tests b/modules/sendto-tests
index afacb2a0eb17a8eead946c2bb858eec8d2690a2e..5b5acc59ea6594363533aee0845715d8ab6208fc 100644 (file)
--- a/modules/sendto-tests
+++ b/modules/sendto-tests
@@ -4,7 +4,7 @@ tests/signature.h
 tests/macros.h
 
 Depends-on:
-netinet_in
+netinet_in-h
 sockets
 inet_pton
 

diff --git a/modules/setsockopt-tests b/modules/setsockopt-tests
index 4704d939437a1015d8d5c074d97a62e503139991..927ad976db9af24cc292c8ebe2e0824480e36aa4 100644 (file)
--- a/modules/setsockopt-tests
+++ b/modules/setsockopt-tests
@@ -4,7 +4,7 @@ tests/signature.h
 tests/macros.h
 
 Depends-on:
-netinet_in
+netinet_in-h
 sockets
 
 configure.ac:

diff --git a/tests/test-netinet_in-c++.cc b/tests/test-netinet_in-h-c++.cc
similarity index 100%
rename from tests/test-netinet_in-c++.cc
rename to tests/test-netinet_in-h-c++.cc

diff --git a/tests/test-netinet_in.c b/tests/test-netinet_in-h.c
similarity index 100%
rename from tests/test-netinet_in.c
rename to tests/test-netinet_in-h.c