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.
2026-04-28 06:33:36 +00:00 · 2024-12-27 23:14:35 +01:00
parent 204dfab731
commit f2b130983d
28 changed files with 118 additions and 79 deletions
--- a/14
+++ b/14
@@ -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.
--- 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
--- 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:
--- 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

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

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

--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- a/modules/netinet_in-c++-tests
+++ b/modules/netinet_in-c++-tests
@@ -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
--- a/modules/netinet_in-h
+++ 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
--- a/modules/netinet_in-h-c++-tests
+++ 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
--- a/modules/netinet_in-h-tests
+++ 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
--- a/modules/netinet_in-tests
+++ b/modules/netinet_in-tests
@@ -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
--- 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
--- 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
--- 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
--- 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:
--- 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
--- 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

--- 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:
--- a/tests/test-netinet_in-h-c++.cc
+++ b/tests/test-netinet_in-h-c++.cc
--- a/tests/test-netinet_in-h.c
+++ b/tests/test-netinet_in-h.c