diff --git a/ChangeLog b/ChangeLog index adf50e86c7..21666360ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2024-12-27 Bruno Haible + + Rename module string to string-h. + * modules/string-h: Renamed from modules/string. + * modules/string-h-tests: Renamed from modules/string-tests. + * modules/string-h-c++-tests: Renamed from modules/string-c++-tests. + * tests/test-string-h.c: Renamed from tests/test-string.c. + * tests/test-string-h-c++.cc: Renamed from tests/test-string-c++.cc. + * tests/test-string-h-c++2.cc: Renamed from tests/test-string-c++2.cc. + * doc/posix-headers/string.texi: Update. + * doc/posix-functions/strcat.texi: Update. + * doc/posix-functions/strcpy.texi: Update. + * doc/posix-functions/strncpy.texi: Update. + * modules/* (Depends-on): Update. + * modules/string: New file. + 2024-12-27 Bruno Haible Rename module stdnoreturn to stdnoreturn-h. diff --git a/doc/posix-functions/strcat.texi b/doc/posix-functions/strcat.texi index 24aa6477de..2e3f9d2dda 100644 --- a/doc/posix-functions/strcat.texi +++ b/doc/posix-functions/strcat.texi @@ -4,8 +4,8 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/strcat.html} -Gnulib module: string -@mindex string +Gnulib module: string-h +@mindex string-h Portability problems fixed by Gnulib: @itemize diff --git a/doc/posix-functions/strcpy.texi b/doc/posix-functions/strcpy.texi index 638aecb232..6bce4d68bb 100644 --- a/doc/posix-functions/strcpy.texi +++ b/doc/posix-functions/strcpy.texi @@ -4,8 +4,8 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/strcpy.html} -Gnulib module: string -@mindex string +Gnulib module: string-h +@mindex string-h Portability problems fixed by Gnulib: @itemize diff --git a/doc/posix-functions/strncpy.texi b/doc/posix-functions/strncpy.texi index ea5f41dcce..8dd33de80e 100644 --- a/doc/posix-functions/strncpy.texi +++ b/doc/posix-functions/strncpy.texi @@ -4,11 +4,11 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/functions/strncpy.html} -Gnulib module: string or strncpy -@mindex string +Gnulib module: string-h or strncpy +@mindex string-h @mindex strncpy -Portability problems fixed by Gnulib module @code{string} or Gnulib module @code{strncpy}: +Portability problems fixed by Gnulib module @code{string-h} or Gnulib module @code{strncpy}: @itemize @item This function cannot be called from plain inline or extern inline functions diff --git a/doc/posix-headers/string.texi b/doc/posix-headers/string.texi index 2e513ebd8e..e3a26c1545 100644 --- a/doc/posix-headers/string.texi +++ b/doc/posix-headers/string.texi @@ -3,8 +3,8 @@ POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/string.h.html} -Gnulib module: string -@mindex string +Gnulib module: string-h +@mindex string-h Portability problems fixed by Gnulib: @itemize diff --git a/modules/dfa b/modules/dfa index 275ddbd3b3..60b0086fc5 100644 --- a/modules/dfa +++ b/modules/dfa @@ -30,7 +30,7 @@ stddef-h stdint-h stdio-h stdlib-h -string +string-h uchar # The lonesome_lower array requires ISO C 23 semantics for char32_t. # But uchar-c23 has a global effect, therefore leave it to each package diff --git a/modules/dfa-tests b/modules/dfa-tests index f3aa498555..6cdacf985f 100644 --- a/modules/dfa-tests +++ b/modules/dfa-tests @@ -8,7 +8,7 @@ Depends-on: binary-io stdio-h stdlib-h -string +string-h unistd regex setlocale diff --git a/modules/explicit_bzero b/modules/explicit_bzero index 8ba9a06ada..7fd0b80ef7 100644 --- a/modules/explicit_bzero +++ b/modules/explicit_bzero @@ -8,7 +8,7 @@ m4/explicit_bzero.m4 Depends-on: extensions memset_explicit -string +string-h configure.ac: gl_FUNC_EXPLICIT_BZERO diff --git a/modules/ffsl b/modules/ffsl index 02990c761d..4cfe1236b4 100644 --- a/modules/ffsl +++ b/modules/ffsl @@ -8,7 +8,7 @@ m4/ffsl.m4 Depends-on: extensions -string +string-h ffs [test $HAVE_FFSL = 0] configure.ac: diff --git a/modules/ffsll b/modules/ffsll index e215301a72..c1f39e55ae 100644 --- a/modules/ffsll +++ b/modules/ffsll @@ -8,7 +8,7 @@ m4/ffsll.m4 Depends-on: extensions -string +string-h ffs [test $HAVE_FFSLL = 0 || test $REPLACE_FFSLL = 1] configure.ac: diff --git a/modules/free-posix b/modules/free-posix index 8e8d0708f8..11b67ca73b 100644 --- a/modules/free-posix +++ b/modules/free-posix @@ -7,7 +7,7 @@ m4/free.m4 Depends-on: stdlib-h -string +string-h wchar configure.ac: diff --git a/modules/getprogname-tests b/modules/getprogname-tests index cbfda75af7..bd7137f8ea 100644 --- a/modules/getprogname-tests +++ b/modules/getprogname-tests @@ -2,7 +2,7 @@ Files: tests/test-getprogname.c Depends-on: -string +string-h configure.ac: diff --git a/modules/mbscasecmp b/modules/mbscasecmp index 38644a7a5d..113df00173 100644 --- a/modules/mbscasecmp +++ b/modules/mbscasecmp @@ -8,7 +8,7 @@ Depends-on: c32tolower mbuiterf [test "$GNULIB_MCEL_PREFER" != yes] stdlib-h -string +string-h uchar configure.ac: diff --git a/modules/mbscasestr b/modules/mbscasestr index a3e702214b..dfb1f82f7d 100644 --- a/modules/mbscasestr +++ b/modules/mbscasestr @@ -9,7 +9,7 @@ Depends-on: alignasof mbuiter stdbool-h -string +string-h mbslen malloca c32tolower diff --git a/modules/mbschr b/modules/mbschr index e99a3caf6c..c1e9c203ca 100644 --- a/modules/mbschr +++ b/modules/mbschr @@ -6,7 +6,7 @@ lib/mbschr.c Depends-on: mbuiterf -string +string-h configure.ac: gl_STRING_MODULE_INDICATOR([mbschr]) diff --git a/modules/mbscspn b/modules/mbscspn index c730f907a7..db4f50861d 100644 --- a/modules/mbscspn +++ b/modules/mbscspn @@ -6,7 +6,7 @@ lib/mbscspn.c Depends-on: mbuiterf -string +string-h mbschr strcspn diff --git a/modules/mbslen b/modules/mbslen index 6b6c6078e5..0426f5a5c8 100644 --- a/modules/mbslen +++ b/modules/mbslen @@ -7,7 +7,7 @@ m4/mbslen.m4 Depends-on: mbuiterf -string +string-h configure.ac: gl_FUNC_MBSLEN diff --git a/modules/mbsncasecmp b/modules/mbsncasecmp index e01a1a8652..665342ddf0 100644 --- a/modules/mbsncasecmp +++ b/modules/mbsncasecmp @@ -7,7 +7,7 @@ lib/mbsncasecmp.c Depends-on: c32tolower mbuiterf -string +string-h configure.ac: gl_STRING_MODULE_INDICATOR([mbsncasecmp]) diff --git a/modules/mbsnlen b/modules/mbsnlen index 3a3486f689..1d39c746af 100644 --- a/modules/mbsnlen +++ b/modules/mbsnlen @@ -6,7 +6,7 @@ lib/mbsnlen.c Depends-on: mbiterf -string +string-h configure.ac: gl_STRING_MODULE_INDICATOR([mbsnlen]) diff --git a/modules/mbspbrk b/modules/mbspbrk index 158f55caa8..8787a088c5 100644 --- a/modules/mbspbrk +++ b/modules/mbspbrk @@ -6,7 +6,7 @@ lib/mbspbrk.c Depends-on: mbuiterf -string +string-h mbschr strpbrk diff --git a/modules/mbspcasecmp b/modules/mbspcasecmp index ffb58bc4f6..29a5f05172 100644 --- a/modules/mbspcasecmp +++ b/modules/mbspcasecmp @@ -7,7 +7,7 @@ lib/mbspcasecmp.c Depends-on: c32tolower mbuiterf -string +string-h configure.ac: gl_STRING_MODULE_INDICATOR([mbspcasecmp]) diff --git a/modules/mbsrchr b/modules/mbsrchr index 56b9ed9489..06fb553fd2 100644 --- a/modules/mbsrchr +++ b/modules/mbsrchr @@ -6,7 +6,7 @@ lib/mbsrchr.c Depends-on: mbuiterf -string +string-h configure.ac: gl_STRING_MODULE_INDICATOR([mbsrchr]) diff --git a/modules/mbssep b/modules/mbssep index 6672d64641..08bbdbf51d 100644 --- a/modules/mbssep +++ b/modules/mbssep @@ -6,7 +6,7 @@ lib/mbssep.c Depends-on: mbuiterf -string +string-h mbspbrk strsep diff --git a/modules/mbsspn b/modules/mbsspn index 25cfd3f59f..d96c1cd5c1 100644 --- a/modules/mbsspn +++ b/modules/mbsspn @@ -6,7 +6,7 @@ lib/mbsspn.c Depends-on: mbuiterf -string +string-h mbschr configure.ac: diff --git a/modules/mbsstr b/modules/mbsstr index fa4949b26f..d19351218c 100644 --- a/modules/mbsstr +++ b/modules/mbsstr @@ -9,7 +9,7 @@ Depends-on: alignasof mbuiter stdbool-h -string +string-h mbslen malloca strnlen diff --git a/modules/mbstok_r b/modules/mbstok_r index 0a41e552ca..457ce53dfc 100644 --- a/modules/mbstok_r +++ b/modules/mbstok_r @@ -5,7 +5,7 @@ Files: lib/mbstok_r.c Depends-on: -string +string-h mbsspn mbspbrk strtok_r diff --git a/modules/memchr b/modules/memchr index d722c92083..ec8d198933 100644 --- a/modules/memchr +++ b/modules/memchr @@ -9,7 +9,7 @@ m4/mmap-anon.m4 Depends-on: extensions -string +string-h configure.ac: gl_FUNC_MEMCHR diff --git a/modules/memcpy b/modules/memcpy index 4083b0f4de..539fb93df2 100644 --- a/modules/memcpy +++ b/modules/memcpy @@ -12,7 +12,7 @@ lib/memcpy.c m4/memcpy.m4 Depends-on: -string +string-h configure.ac: gl_FUNC_MEMCPY diff --git a/modules/memmem-simple b/modules/memmem-simple index ab6c173041..40e3aba584 100644 --- a/modules/memmem-simple +++ b/modules/memmem-simple @@ -9,7 +9,7 @@ m4/memmem.m4 Depends-on: builtin-expect extensions -string +string-h stdint-h memchr memcmp diff --git a/modules/memmove b/modules/memmove index 2afdb07d39..0b2cea5039 100644 --- a/modules/memmove +++ b/modules/memmove @@ -12,7 +12,7 @@ lib/memmove.c m4/memmove.m4 Depends-on: -string +string-h configure.ac: gl_FUNC_MEMMOVE diff --git a/modules/mempcpy b/modules/mempcpy index 469dbd8789..710b87c643 100644 --- a/modules/mempcpy +++ b/modules/mempcpy @@ -7,7 +7,7 @@ m4/mempcpy.m4 Depends-on: extensions -string +string-h configure.ac: gl_FUNC_MEMPCPY diff --git a/modules/memrchr b/modules/memrchr index c6b832a8cd..47c7e8c4b6 100644 --- a/modules/memrchr +++ b/modules/memrchr @@ -7,7 +7,7 @@ m4/memrchr.m4 Depends-on: extensions -string +string-h configure.ac: gl_FUNC_MEMRCHR diff --git a/modules/memset b/modules/memset index defc5baf7d..2ee1dfef28 100644 --- a/modules/memset +++ b/modules/memset @@ -12,7 +12,7 @@ lib/memset.c m4/memset.m4 Depends-on: -string +string-h configure.ac: gl_FUNC_MEMSET diff --git a/modules/memset_explicit b/modules/memset_explicit index 294c9f4d8e..468aef0436 100644 --- a/modules/memset_explicit +++ b/modules/memset_explicit @@ -6,7 +6,7 @@ lib/memset_explicit.c m4/memset_explicit.m4 Depends-on: -string +string-h extensions configure.ac: diff --git a/modules/posixcheck b/modules/posixcheck index fbb7d2c2c1..8394ede762 100644 --- a/modules/posixcheck +++ b/modules/posixcheck @@ -30,7 +30,7 @@ signal-h spawn-h stdio-h stdlib-h -string +string-h strings sys_file sys_ioctl diff --git a/modules/rawmemchr b/modules/rawmemchr index b235d1fb65..f2e94c6acf 100644 --- a/modules/rawmemchr +++ b/modules/rawmemchr @@ -10,7 +10,7 @@ Depends-on: assert-h extensions stdint-h -string +string-h configure.ac: gl_FUNC_RAWMEMCHR diff --git a/modules/relocatable-prog-wrapper b/modules/relocatable-prog-wrapper index 59a1e605b9..cfd1719a9f 100644 --- a/modules/relocatable-prog-wrapper +++ b/modules/relocatable-prog-wrapper @@ -74,7 +74,7 @@ stddef-h stdckdint-h stdint-h stdlib-h -string +string-h sys_stat unistd xalloc-oversized diff --git a/modules/sigabbrev_np b/modules/sigabbrev_np index 7531138fc0..a91e6ec9f6 100644 --- a/modules/sigabbrev_np +++ b/modules/sigabbrev_np @@ -7,7 +7,7 @@ m4/sigabbrev_np.m4 Depends-on: extensions -string +string-h configure.ac: gl_FUNC_SIGABBREV_NP diff --git a/modules/sigdescr_np b/modules/sigdescr_np index e085f9487b..3e3b0a8f7d 100644 --- a/modules/sigdescr_np +++ b/modules/sigdescr_np @@ -7,7 +7,7 @@ m4/sigdescr_np.m4 Depends-on: extensions -string +string-h configure.ac: gl_FUNC_SIGDESCR_NP diff --git a/modules/snprintf-posix b/modules/snprintf-posix index e099c7644e..1edfd3591d 100644 --- a/modules/snprintf-posix +++ b/modules/snprintf-posix @@ -1,6 +1,6 @@ Description: POSIX compatible snprintf() function: print formatted output to a fixed length -string +string-h Comment: This module should not be used as a dependency from a test module, diff --git a/modules/stack-tests b/modules/stack-tests index b38e350083..10b3f55868 100644 --- a/modules/stack-tests +++ b/modules/stack-tests @@ -3,7 +3,7 @@ tests/test-stack.c tests/macros.h Depends-on: -string +string-h configure.ac: diff --git a/modules/stpcpy b/modules/stpcpy index 66c481d691..8dfc03076e 100644 --- a/modules/stpcpy +++ b/modules/stpcpy @@ -7,7 +7,7 @@ m4/stpcpy.m4 Depends-on: extensions -string +string-h configure.ac: gl_FUNC_STPCPY diff --git a/modules/stpncpy b/modules/stpncpy index 5e95a25c99..c1093474d5 100644 --- a/modules/stpncpy +++ b/modules/stpncpy @@ -7,7 +7,7 @@ m4/stpncpy.m4 Depends-on: extensions -string +string-h configure.ac: gl_FUNC_STPNCPY diff --git a/modules/strcasestr-simple b/modules/strcasestr-simple index f7105e7f55..c538d5d7bb 100644 --- a/modules/strcasestr-simple +++ b/modules/strcasestr-simple @@ -7,7 +7,7 @@ lib/str-two-way.h m4/strcasestr.m4 Depends-on: -string +string-h stdbool-h strcase memchr diff --git a/modules/strchrnul b/modules/strchrnul index 6c3f088d90..a563d7a30c 100644 --- a/modules/strchrnul +++ b/modules/strchrnul @@ -8,7 +8,7 @@ lib/strchrnul.valgrind m4/strchrnul.m4 Depends-on: -string +string-h extensions rawmemchr [test $HAVE_STRCHRNUL = 0 || test $REPLACE_STRCHRNUL = 1] diff --git a/modules/strdup b/modules/strdup index fecdc554ba..3b62dbaf8a 100644 --- a/modules/strdup +++ b/modules/strdup @@ -11,7 +11,7 @@ Files: m4/strdup.m4 Depends-on: -string +string-h configure.ac: gl_FUNC_STRDUP diff --git a/modules/strdup-posix b/modules/strdup-posix index 5eab0ed415..4d3dd428b6 100644 --- a/modules/strdup-posix +++ b/modules/strdup-posix @@ -6,7 +6,7 @@ lib/strdup.c m4/strdup.m4 Depends-on: -string +string-h malloc-posix [test $REPLACE_STRDUP = 1] configure.ac: diff --git a/modules/strerror b/modules/strerror index c058119036..ddba80c816 100644 --- a/modules/strerror +++ b/modules/strerror @@ -6,7 +6,7 @@ lib/strerror.c m4/strerror.m4 Depends-on: -string +string-h assert-h [test $REPLACE_STRERROR = 1] errno-h [test $REPLACE_STRERROR = 1] intprops [test $REPLACE_STRERROR = 1] diff --git a/modules/strerror_r-posix b/modules/strerror_r-posix index 350824e056..eba6e8839b 100644 --- a/modules/strerror_r-posix +++ b/modules/strerror_r-posix @@ -6,7 +6,7 @@ lib/strerror_r.c m4/strerror_r.m4 Depends-on: -string +string-h extensions errno-h [test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1] lock [test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1] diff --git a/modules/strerrorname_np b/modules/strerrorname_np index 03e5e7de48..b36352df09 100644 --- a/modules/strerrorname_np +++ b/modules/strerrorname_np @@ -7,7 +7,7 @@ m4/strerrorname_np.m4 Depends-on: extensions -string +string-h configure.ac: gl_FUNC_STRERRORNAME_NP diff --git a/modules/string b/modules/string index 0dfa096cc8..04039d5acc 100644 --- a/modules/string +++ b/modules/string @@ -1,140 +1,20 @@ Description: A GNU-like . +Status: +deprecated + +Notice: +This module is deprecated. Use the module 'string-h' instead. + Files: -lib/string.in.h -m4/string_h.m4 Depends-on: -extensions -extern-inline -gen-header -include_next -snippet/arg-nonnull -snippet/c++defs -snippet/warn-on-use -stddef-h -stdlib-h +string-h configure.ac: -gl_STRING_H -gl_STRING_H_REQUIRE_DEFAULTS -AC_PROG_MKDIR_P Makefile.am: -BUILT_SOURCES += string.h - -# We need the following in order to create when the system -# doesn't have one that works with the given compiler. -string.h: string.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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ - -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GNULIB_EXPLICIT_BZERO)/g' \ - -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \ - -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \ - -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \ - -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \ - -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \ - -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \ - -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \ - -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \ - -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \ - -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \ - -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \ - -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \ - -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \ - -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \ - -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \ - -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \ - -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \ - -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \ - -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \ - -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \ - -e 's/@''GNULIB_MEMSET_EXPLICIT''@/$(GNULIB_MEMSET_EXPLICIT)/g' \ - -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \ - -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \ - -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \ - -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \ - -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \ - -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \ - -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \ - -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \ - -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \ - -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \ - -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \ - -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \ - -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \ - -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \ - -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \ - -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GNULIB_STRERRORNAME_NP)/g' \ - -e 's/@''GNULIB_SIGABBREV_NP''@/$(GNULIB_SIGABBREV_NP)/g' \ - -e 's/@''GNULIB_SIGDESCR_NP''@/$(GNULIB_SIGDESCR_NP)/g' \ - -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ - -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ - -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GNULIB_MDA_MEMCCPY)/g' \ - -e 's/@''GNULIB_MDA_STRDUP''@/$(GNULIB_MDA_STRDUP)/g' \ - -e 's/@''GNULIB_FREE_POSIX''@/$(GNULIB_FREE_POSIX)/g' \ - < $(srcdir)/string.in.h > $@-t1 - $(AM_V_at)sed \ - -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \ - -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ - -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \ - -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ - -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \ - -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \ - -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \ - -e 's|@''HAVE_MEMSET_EXPLICIT''@|$(HAVE_MEMSET_EXPLICIT)|g' \ - -e 's|@''HAVE_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \ - -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \ - -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \ - -e 's|@''HAVE_STRCHRNUL''@|$(HAVE_STRCHRNUL)|g' \ - -e 's|@''HAVE_DECL_STRDUP''@|$(HAVE_DECL_STRDUP)|g' \ - -e 's|@''HAVE_DECL_STRNDUP''@|$(HAVE_DECL_STRNDUP)|g' \ - -e 's|@''HAVE_DECL_STRNLEN''@|$(HAVE_DECL_STRNLEN)|g' \ - -e 's|@''HAVE_STRPBRK''@|$(HAVE_STRPBRK)|g' \ - -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \ - -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \ - -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \ - -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \ - -e 's|@''HAVE_STRERRORNAME_NP''@|$(HAVE_STRERRORNAME_NP)|g' \ - -e 's|@''HAVE_SIGABBREV_NP''@|$(HAVE_SIGABBREV_NP)|g' \ - -e 's|@''HAVE_SIGDESCR_NP''@|$(HAVE_SIGDESCR_NP)|g' \ - -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ - -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \ - -e 's|@''REPLACE_FFSLL''@|$(REPLACE_FFSLL)|g' \ - -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ - -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ - -e 's|@''REPLACE_MEMPCPY''@|$(REPLACE_MEMPCPY)|g' \ - -e 's|@''REPLACE_MEMSET_EXPLICIT''@|$(REPLACE_MEMSET_EXPLICIT)|g' \ - -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \ - -e 's|@''REPLACE_STPCPY''@|$(REPLACE_STPCPY)|g' \ - -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ - -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \ - -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \ - -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \ - -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \ - -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \ - -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ - -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \ - -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \ - -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ - -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \ - -e 's|@''REPLACE_STRERRORNAME_NP''@|$(REPLACE_STRERRORNAME_NP)|g' \ - -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ - -e 's|@''REPLACE_STRVERSCMP''@|$(REPLACE_STRVERSCMP)|g' \ - -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|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)' \ - < $@-t1 > $@-t2 - $(AM_V_at)rm -f $@-t1 - $(AM_V_at)mv $@-t2 $@ -MOSTLYCLEANFILES += string.h string.h-t1 string.h-t2 Include: @@ -143,4 +23,3 @@ License: LGPLv2+ Maintainer: -all diff --git a/modules/string-c++-tests b/modules/string-c++-tests deleted file mode 100644 index fb44ae42da..0000000000 --- a/modules/string-c++-tests +++ /dev/null @@ -1,20 +0,0 @@ -Files: -tests/test-string-c++.cc -tests/test-string-c++2.cc -tests/signature.h - -Status: -c++-test - -Depends-on: -ansi-c++-opt - -configure.ac: - -Makefile.am: -if ANSICXX -TESTS += test-string-c++ -check_PROGRAMS += test-string-c++ -test_string_c___SOURCES = test-string-c++.cc test-string-c++2.cc -test_string_c___LDADD = $(LDADD) $(LIBUNISTRING) $(LIBINTL) $(LIBC32CONV) $(LIBTHREAD) -endif diff --git a/modules/string-h b/modules/string-h new file mode 100644 index 0000000000..0dfa096cc8 --- /dev/null +++ b/modules/string-h @@ -0,0 +1,146 @@ +Description: +A GNU-like . + +Files: +lib/string.in.h +m4/string_h.m4 + +Depends-on: +extensions +extern-inline +gen-header +include_next +snippet/arg-nonnull +snippet/c++defs +snippet/warn-on-use +stddef-h +stdlib-h + +configure.ac: +gl_STRING_H +gl_STRING_H_REQUIRE_DEFAULTS +AC_PROG_MKDIR_P + +Makefile.am: +BUILT_SOURCES += string.h + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +string.h: string.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|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ + -e 's/@''GNULIB_EXPLICIT_BZERO''@/$(GNULIB_EXPLICIT_BZERO)/g' \ + -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \ + -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \ + -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \ + -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \ + -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \ + -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \ + -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \ + -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \ + -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \ + -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \ + -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \ + -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \ + -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \ + -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \ + -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \ + -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \ + -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \ + -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \ + -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \ + -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \ + -e 's/@''GNULIB_MEMSET_EXPLICIT''@/$(GNULIB_MEMSET_EXPLICIT)/g' \ + -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \ + -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \ + -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \ + -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \ + -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \ + -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \ + -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \ + -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \ + -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \ + -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \ + -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \ + -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \ + -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \ + -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \ + -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \ + -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GNULIB_STRERRORNAME_NP)/g' \ + -e 's/@''GNULIB_SIGABBREV_NP''@/$(GNULIB_SIGABBREV_NP)/g' \ + -e 's/@''GNULIB_SIGDESCR_NP''@/$(GNULIB_SIGDESCR_NP)/g' \ + -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ + -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ + -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GNULIB_MDA_MEMCCPY)/g' \ + -e 's/@''GNULIB_MDA_STRDUP''@/$(GNULIB_MDA_STRDUP)/g' \ + -e 's/@''GNULIB_FREE_POSIX''@/$(GNULIB_FREE_POSIX)/g' \ + < $(srcdir)/string.in.h > $@-t1 + $(AM_V_at)sed \ + -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \ + -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ + -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \ + -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ + -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \ + -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \ + -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \ + -e 's|@''HAVE_MEMSET_EXPLICIT''@|$(HAVE_MEMSET_EXPLICIT)|g' \ + -e 's|@''HAVE_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \ + -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \ + -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \ + -e 's|@''HAVE_STRCHRNUL''@|$(HAVE_STRCHRNUL)|g' \ + -e 's|@''HAVE_DECL_STRDUP''@|$(HAVE_DECL_STRDUP)|g' \ + -e 's|@''HAVE_DECL_STRNDUP''@|$(HAVE_DECL_STRNDUP)|g' \ + -e 's|@''HAVE_DECL_STRNLEN''@|$(HAVE_DECL_STRNLEN)|g' \ + -e 's|@''HAVE_STRPBRK''@|$(HAVE_STRPBRK)|g' \ + -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \ + -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \ + -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \ + -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \ + -e 's|@''HAVE_STRERRORNAME_NP''@|$(HAVE_STRERRORNAME_NP)|g' \ + -e 's|@''HAVE_SIGABBREV_NP''@|$(HAVE_SIGABBREV_NP)|g' \ + -e 's|@''HAVE_SIGDESCR_NP''@|$(HAVE_SIGDESCR_NP)|g' \ + -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ + -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \ + -e 's|@''REPLACE_FFSLL''@|$(REPLACE_FFSLL)|g' \ + -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ + -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ + -e 's|@''REPLACE_MEMPCPY''@|$(REPLACE_MEMPCPY)|g' \ + -e 's|@''REPLACE_MEMSET_EXPLICIT''@|$(REPLACE_MEMSET_EXPLICIT)|g' \ + -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \ + -e 's|@''REPLACE_STPCPY''@|$(REPLACE_STPCPY)|g' \ + -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ + -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \ + -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \ + -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \ + -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \ + -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \ + -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ + -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \ + -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \ + -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ + -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \ + -e 's|@''REPLACE_STRERRORNAME_NP''@|$(REPLACE_STRERRORNAME_NP)|g' \ + -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ + -e 's|@''REPLACE_STRVERSCMP''@|$(REPLACE_STRVERSCMP)|g' \ + -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|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)' \ + < $@-t1 > $@-t2 + $(AM_V_at)rm -f $@-t1 + $(AM_V_at)mv $@-t2 $@ +MOSTLYCLEANFILES += string.h string.h-t1 string.h-t2 + +Include: + + +License: +LGPLv2+ + +Maintainer: +all diff --git a/modules/string-h-c++-tests b/modules/string-h-c++-tests new file mode 100644 index 0000000000..999c77370e --- /dev/null +++ b/modules/string-h-c++-tests @@ -0,0 +1,20 @@ +Files: +tests/test-string-h-c++.cc +tests/test-string-h-c++2.cc +tests/signature.h + +Status: +c++-test + +Depends-on: +ansi-c++-opt + +configure.ac: + +Makefile.am: +if ANSICXX +TESTS += test-string-h-c++ +check_PROGRAMS += test-string-h-c++ +test_string_h_c___SOURCES = test-string-h-c++.cc test-string-h-c++2.cc +test_string_h_c___LDADD = $(LDADD) $(LIBUNISTRING) $(LIBINTL) $(LIBC32CONV) $(LIBTHREAD) +endif diff --git a/modules/string-h-tests b/modules/string-h-tests new file mode 100644 index 0000000000..fd34276dec --- /dev/null +++ b/modules/string-h-tests @@ -0,0 +1,12 @@ +Files: +tests/test-string-h.c + +Depends-on: +assert-h +string-h-c++-tests + +configure.ac: + +Makefile.am: +TESTS += test-string-h +check_PROGRAMS += test-string-h diff --git a/modules/string-tests b/modules/string-tests deleted file mode 100644 index b469c2e048..0000000000 --- a/modules/string-tests +++ /dev/null @@ -1,12 +0,0 @@ -Files: -tests/test-string.c - -Depends-on: -assert-h -string-c++-tests - -configure.ac: - -Makefile.am: -TESTS += test-string -check_PROGRAMS += test-string diff --git a/modules/strncat b/modules/strncat index eacd0a4029..7902267c04 100644 --- a/modules/strncat +++ b/modules/strncat @@ -7,7 +7,7 @@ m4/strncat.m4 m4/mmap-anon.m4 Depends-on: -string +string-h configure.ac: gl_FUNC_STRNCAT diff --git a/modules/strncpy b/modules/strncpy index de91ffde5e..ac1188605b 100644 --- a/modules/strncpy +++ b/modules/strncpy @@ -10,7 +10,7 @@ This module is obsolete. Files: Depends-on: -string +string-h configure.ac: diff --git a/modules/strndup b/modules/strndup index af1214817a..b3b88ea0a5 100644 --- a/modules/strndup +++ b/modules/strndup @@ -6,7 +6,7 @@ lib/strndup.c m4/strndup.m4 Depends-on: -string +string-h extensions strnlen [test $HAVE_STRNDUP = 0 || test $REPLACE_STRNDUP = 1] diff --git a/modules/strnlen b/modules/strnlen index 3ef0b850f4..9880361f10 100644 --- a/modules/strnlen +++ b/modules/strnlen @@ -6,7 +6,7 @@ lib/strnlen.c m4/strnlen.m4 Depends-on: -string +string-h extensions configure.ac: diff --git a/modules/strpbrk b/modules/strpbrk index 76c0626c6c..61adc7da8f 100644 --- a/modules/strpbrk +++ b/modules/strpbrk @@ -12,7 +12,7 @@ lib/strpbrk.c m4/strpbrk.m4 Depends-on: -string +string-h configure.ac: gl_FUNC_STRPBRK diff --git a/modules/strptime b/modules/strptime index 44df3a08dd..37cd9b6541 100644 --- a/modules/strptime +++ b/modules/strptime @@ -10,7 +10,7 @@ Depends-on: time-h extensions sys_time [test $HAVE_STRPTIME = 0] -string [test $HAVE_STRPTIME = 0] +string-h [test $HAVE_STRPTIME = 0] strcase [test $HAVE_STRPTIME = 0] stdbool-h [test $HAVE_STRPTIME = 0] time_r [test $HAVE_STRPTIME = 0] diff --git a/modules/strsep b/modules/strsep index 9717202f12..932b2483c0 100644 --- a/modules/strsep +++ b/modules/strsep @@ -6,7 +6,7 @@ lib/strsep.c m4/strsep.m4 Depends-on: -string +string-h extensions strpbrk [test $HAVE_STRSEP = 0] diff --git a/modules/strsignal b/modules/strsignal index 2e8c6ad759..f97a528150 100644 --- a/modules/strsignal +++ b/modules/strsignal @@ -7,7 +7,7 @@ lib/siglist.h m4/strsignal.m4 Depends-on: -string +string-h extensions gettext-h [test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1] gnulib-i18n [test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1] diff --git a/modules/strstr-simple b/modules/strstr-simple index acc7d14694..bb4568a66a 100644 --- a/modules/strstr-simple +++ b/modules/strstr-simple @@ -7,7 +7,7 @@ lib/strstr.c m4/strstr.m4 Depends-on: -string +string-h builtin-expect [test $REPLACE_STRSTR = 1] stdbool-h [test $REPLACE_STRSTR = 1] memchr [test $REPLACE_STRSTR = 1] diff --git a/modules/strtok_r b/modules/strtok_r index 32ac475c6d..99d87220ba 100644 --- a/modules/strtok_r +++ b/modules/strtok_r @@ -6,7 +6,7 @@ lib/strtok_r.c m4/strtok_r.m4 Depends-on: -string +string-h strpbrk [test $HAVE_STRTOK_R = 0 || test $REPLACE_STRTOK_R = 1] configure.ac: diff --git a/modules/strverscmp b/modules/strverscmp index 79af677848..1bebb2dcda 100644 --- a/modules/strverscmp +++ b/modules/strverscmp @@ -9,7 +9,7 @@ Depends-on: extensions libc-config [test $HAVE_STRVERSCMP = 0 || test $REPLACE_STRVERSCMP = 1] stdint-h [test $HAVE_STRVERSCMP = 0 || test $REPLACE_STRVERSCMP = 1] -string +string-h configure.ac: gl_FUNC_STRVERSCMP diff --git a/modules/vsnprintf-posix b/modules/vsnprintf-posix index 720dcedf02..50b07d318f 100644 --- a/modules/vsnprintf-posix +++ b/modules/vsnprintf-posix @@ -1,6 +1,6 @@ Description: POSIX compatible vsnprintf() function: print formatted output to a fixed length -string +string-h Comment: This module should not be used as a dependency from a test module, diff --git a/tests/test-string-c++.cc b/tests/test-string-h-c++.cc similarity index 100% rename from tests/test-string-c++.cc rename to tests/test-string-h-c++.cc diff --git a/tests/test-string-c++2.cc b/tests/test-string-h-c++2.cc similarity index 100% rename from tests/test-string-c++2.cc rename to tests/test-string-h-c++2.cc diff --git a/tests/test-string.c b/tests/test-string-h.c similarity index 100% rename from tests/test-string.c rename to tests/test-string-h.c