diff options
| author | Bruno Haible <bruno@clisp.org> | 2020-07-08 03:19:54 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2020-07-08 03:19:54 +0200 |
| commit | 707090c9ed6a16bc4b152be300578761e34b2bed (patch) | |
| tree | 285ceb1cfcf1caa1e8c759406631b8f37ccbf0b4 /modules | |
| parent | cfcb5fc6b95ca04bd3c8637d4027641d07c15cbe (diff) | |
| download | gnulib-707090c9ed6a16bc4b152be300578761e34b2bed.tar.gz | |
memchr: Remove support for some very old platforms.
* m4/memchr-obsolete.m4: Remove file.
* modules/memchr-obsolete: Remove file.
* m4/memchr.m4 (gl_FUNC_MEMCHR): Assume module 'memchr-obsolete' is
absent. Don't define HAVE_MEMCHR.
* lib/string.in.h (memchr): Assume HAVE_MEMCHR is 1.
* modules/memchr (Depends-on): Remove memchr-obsolete.
(configure.ac): Assume HAVE_MEMCHR is 1.
* m4/string_h.m4 (gl_HEADER_STRING_H_DEFAULTS): Don't initialize
HAVE_MEMCHR.
* modules/string (Makefile.am): Don't substitute HAVE_MEMCHR.
* doc/posix-functions/memchr.texi: Don't mention module
'memchr-obsolete'.
* m4/strcasestr.m4 (gl_FUNC_STRCASESTR_SIMPLE): Assume HAVE_MEMCHR is 1.
* m4/strstr.m4 (gl_FUNC_STRSTR_SIMPLE): Assume HAVE_MEMCHR is 1.
* modules/strnlen (Depends-on): Remove memchr-obsolete.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/memchr | 3 | ||||
| -rw-r--r-- | modules/memchr-obsolete | 28 | ||||
| -rw-r--r-- | modules/string | 1 | ||||
| -rw-r--r-- | modules/strnlen | 1 |
4 files changed, 1 insertions, 32 deletions
diff --git a/modules/memchr b/modules/memchr index ed80e0c2d7..3a413a20b4 100644 --- a/modules/memchr +++ b/modules/memchr @@ -10,11 +10,10 @@ m4/mmap-anon.m4 Depends-on: extensions string -memchr-obsolete configure.ac: gl_FUNC_MEMCHR -if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then +if test $REPLACE_MEMCHR = 1; then AC_LIBOBJ([memchr]) gl_PREREQ_MEMCHR fi diff --git a/modules/memchr-obsolete b/modules/memchr-obsolete deleted file mode 100644 index c1a6e439e0..0000000000 --- a/modules/memchr-obsolete +++ /dev/null @@ -1,28 +0,0 @@ -Description: -memchr() function for old platforms. - -Status: -obsolete - -Notice: -This module is obsolete. - -Files: -m4/memchr-obsolete.m4 - -Depends-on: -memchr - -configure.ac: -gl_FUNC_MEMCHR_OBSOLETE - -Makefile.am: - -Include: -<string.h> - -License: -LGPLv2+ - -Maintainer: -all diff --git a/modules/string b/modules/string index 67209d5df9..bc87bc8818 100644 --- a/modules/string +++ b/modules/string @@ -73,7 +73,6 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \ -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ - -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|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' \ diff --git a/modules/strnlen b/modules/strnlen index c78167113d..ea5658a072 100644 --- a/modules/strnlen +++ b/modules/strnlen @@ -8,7 +8,6 @@ m4/strnlen.m4 Depends-on: string extensions -memchr-obsolete [test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1] configure.ac: gl_FUNC_STRNLEN |