upstream-mirrors/gnulib
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/gnulib.git synced 2026-05-13 15:13:36 +00:00
Code Activity

Rename module sys_ioctl to sys_ioctl-h.

Browse Source 
* modules/sys_ioctl-h: Renamed from modules/sys_ioctl.
* modules/sys_ioctl-h-tests: Renamed from modules/sys_ioctl-tests.
* modules/sys_ioctl-h-c++-tests: Renamed from
modules/sys_ioctl-c++-tests.
* tests/test-sys_ioctl-h.c: Renamed from tests/test-sys_ioctl.c.
* tests/test-sys_ioctl-h-c++.cc: Renamed from
tests/test-sys_ioctl-c++.cc.
* doc/glibc-headers/sys_ioctl.texi: Update.
* modules/* (Depends-on): Update.
* modules/sys_ioctl: New file.
This commit is contained in:
Bruno Haible
2024-12-27 23:39:49 +01:00
parent 7cd7c52cf0
commit ba9aeda335
17 changed files with 112 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@@ -1,3 +1,17 @@
2024-12-27 Bruno Haible <bruno@clisp.org>
Rename module sys_ioctl to sys_ioctl-h.
* modules/sys_ioctl-h: Renamed from modules/sys_ioctl.
* modules/sys_ioctl-h-tests: Renamed from modules/sys_ioctl-tests.
* modules/sys_ioctl-h-c++-tests: Renamed from
modules/sys_ioctl-c++-tests.
* tests/test-sys_ioctl-h.c: Renamed from tests/test-sys_ioctl.c.
* tests/test-sys_ioctl-h-c++.cc: Renamed from
tests/test-sys_ioctl-c++.cc.
* doc/glibc-headers/sys_ioctl.texi: Update.
* modules/* (Depends-on): Update.
* modules/sys_ioctl: New file.
2024-12-27 Bruno Haible <bruno@clisp.org>
Rename module sys_file to sys_file-h.

4
doc/glibc-headers/sys_ioctl.texi
View File

@@ -16,8 +16,8 @@ Documentation:
@uref{https://www.kernel.org/doc/man-pages/online/pages/man2/ioctl.2.html,,man ioctl}.
@end itemize
Gnulib module: sys_ioctl
@mindex sys_ioctl
Gnulib module: sys_ioctl-h
@mindex sys_ioctl-h
Portability problems fixed by Gnulib:
@itemize

2
modules/ioctl
View File

@@ -7,7 +7,7 @@ lib/w32sock.h
m4/ioctl.m4
Depends-on:
sys_ioctl
sys_ioctl-h
sys_socket [test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1]
errno-h [test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1]
fd-hook [test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1]

2
modules/login_tty
View File

@@ -9,7 +9,7 @@ m4/pty.m4
Depends-on:
utmp
sys_ioctl
sys_ioctl-h
open [test $HAVE_LOGIN_TTY = 0]
configure.ac:

2
modules/poll-tests
View File

@@ -8,7 +8,7 @@ stdbool-h
sys_socket
netinet_in-h
arpa_inet-h
sys_ioctl
sys_ioctl-h
extensions
inet_pton
errno-h

2
modules/posixcheck
View File

@@ -33,7 +33,7 @@ stdlib-h
string-h
strings-h
sys_file-h
sys_ioctl
sys_ioctl-h
sys_random
sys_resource
sys_select

2
modules/pselect-tests
View File

@@ -9,7 +9,7 @@ stdbool-h
netinet_in-h
arpa_inet-h
unistd
sys_ioctl
sys_ioctl-h
extensions
inet_pton
errno-h

2
modules/select-tests
View File

@@ -14,7 +14,7 @@ sys_socket
netinet_in-h
arpa_inet-h
unistd
sys_ioctl
sys_ioctl-h
extensions
inet_pton
errno-h

41
modules/sys_ioctl
View File

@@ -1,46 +1,20 @@
Description:
A <sys/ioctl.h> for systems with missing declarations.
Status:
deprecated
Notice:
This module is deprecated. Use the module 'sys_ioctl-h' instead.
Files:
lib/sys_ioctl.in.h
m4/sys_ioctl_h.m4
Depends-on:
gen-header
include_next
snippet/c++defs
snippet/warn-on-use
unistd
sys_ioctl-h
configure.ac:
gl_SYS_IOCTL_H
gl_SYS_IOCTL_H_REQUIRE_DEFAULTS
AC_PROG_MKDIR_P
Makefile.am:
BUILT_SOURCES += sys/ioctl.h
# We need the following in order to create <sys/ioctl.h> when the system
# does not have a complete one.
sys/ioctl.h: sys_ioctl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
$(AM_V_at)$(SED_HEADER_STDOUT) \
-e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''HAVE_SYS_IOCTL_H''@|$(HAVE_SYS_IOCTL_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_SYS_IOCTL_H''@|$(NEXT_SYS_IOCTL_H)|g' \
-e 's/@''GNULIB_IOCTL''@/$(GNULIB_IOCTL)/g' \
-e 's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H''@|$(SYS_IOCTL_H_HAVE_WINSOCK2_H)|g' \
-e 's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \
-e 's|@''REPLACE_IOCTL''@|$(REPLACE_IOCTL)|g' \
-e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
$(srcdir)/sys_ioctl.in.h > $@-t
$(AM_V_at)mv $@-t $@
MOSTLYCLEANFILES += sys/ioctl.h sys/ioctl.h-t
MOSTLYCLEANDIRS += sys
Include:
<sys/ioctl.h>
@@ -49,4 +23,3 @@ License:
LGPLv2+
Maintainer:
all

19
modules/sys_ioctl-c++-tests
View File

@@ -1,19 +0,0 @@
Files:
tests/test-sys_ioctl-c++.cc
tests/signature.h
Status:
c++-test
Depends-on:
ansi-c++-opt
configure.ac:
Makefile.am:
if ANSICXX
TESTS += test-sys_ioctl-c++
check_PROGRAMS += test-sys_ioctl-c++
test_sys_ioctl_c___SOURCES = test-sys_ioctl-c++.cc
test_sys_ioctl_c___LDADD = $(LDADD) $(LIBINTL) $(LIBSOCKET) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN)
endif

52
modules/sys_ioctl-h Normal file
View File

@@ -0,0 +1,52 @@
Description:
A <sys/ioctl.h> for systems with missing declarations.
Files:
lib/sys_ioctl.in.h
m4/sys_ioctl_h.m4
Depends-on:
gen-header
include_next
snippet/c++defs
snippet/warn-on-use
unistd
configure.ac:
gl_SYS_IOCTL_H
gl_SYS_IOCTL_H_REQUIRE_DEFAULTS
AC_PROG_MKDIR_P
Makefile.am:
BUILT_SOURCES += sys/ioctl.h
# We need the following in order to create <sys/ioctl.h> when the system
# does not have a complete one.
sys/ioctl.h: sys_ioctl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
$(AM_V_GEN)$(MKDIR_P) '%reldir%/sys'
$(AM_V_at)$(SED_HEADER_STDOUT) \
-e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-e 's|@''HAVE_SYS_IOCTL_H''@|$(HAVE_SYS_IOCTL_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_SYS_IOCTL_H''@|$(NEXT_SYS_IOCTL_H)|g' \
-e 's/@''GNULIB_IOCTL''@/$(GNULIB_IOCTL)/g' \
-e 's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H''@|$(SYS_IOCTL_H_HAVE_WINSOCK2_H)|g' \
-e 's|@''SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \
-e 's|@''REPLACE_IOCTL''@|$(REPLACE_IOCTL)|g' \
-e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
$(srcdir)/sys_ioctl.in.h > $@-t
$(AM_V_at)mv $@-t $@
MOSTLYCLEANFILES += sys/ioctl.h sys/ioctl.h-t
MOSTLYCLEANDIRS += sys
Include:
<sys/ioctl.h>
License:
LGPLv2+
Maintainer:
all

19
modules/sys_ioctl-h-c++-tests Normal file
View File

@@ -0,0 +1,19 @@
Files:
tests/test-sys_ioctl-h-c++.cc
tests/signature.h
Status:
c++-test
Depends-on:
ansi-c++-opt
configure.ac:
Makefile.am:
if ANSICXX
TESTS += test-sys_ioctl-h-c++
check_PROGRAMS += test-sys_ioctl-h-c++
test_sys_ioctl_h_c___SOURCES = test-sys_ioctl-h-c++.cc
test_sys_ioctl_h_c___LDADD = $(LDADD) $(LIBINTL) $(LIBSOCKET) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN)
endif

11
modules/sys_ioctl-h-tests Normal file
View File

@@ -0,0 +1,11 @@
Files:
tests/test-sys_ioctl-h.c
Depends-on:
sys_ioctl-h-c++-tests
configure.ac:
Makefile.am:
TESTS += test-sys_ioctl-h
check_PROGRAMS += test-sys_ioctl-h

11
modules/sys_ioctl-tests
View File

@@ -1,11 +0,0 @@
Files:
tests/test-sys_ioctl.c
Depends-on:
sys_ioctl-c++-tests
configure.ac:
Makefile.am:
TESTS += test-sys_ioctl
check_PROGRAMS += test-sys_ioctl

2
modules/tcgetsid
View File

@@ -9,7 +9,7 @@ m4/tcgetsid.m4
Depends-on:
termios
extensions
sys_ioctl [test $HAVE_TCGETSID = 0]
sys_ioctl-h [test $HAVE_TCGETSID = 0]
configure.ac:
gl_FUNC_TCGETSID

0
tests/test-sys_ioctl-c++.cc → tests/test-sys_ioctl-h-c++.cc
View File

0
tests/test-sys_ioctl.c → tests/test-sys_ioctl-h.c
View File