From 5c80d751c5aed9b6bbaf2ad5dd3707cd94cde8a2 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 20 Oct 2001 15:25:46 +0000 Subject: [PATCH] Assume strchr() exists. --- ChangeLog | 5 +++++ configure.in | 4 ++-- intl/ChangeLog | 9 +++++++++ intl/dcigettext.c | 6 ------ intl/l10nflist.c | 5 ----- intl/localealias.c | 6 ------ lib/ChangeLog | 5 +++++ lib/system.h | 5 ----- m4/ChangeLog | 5 +++++ m4/gettext.m4 | 4 ++-- 10 files changed, 28 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 36488c448..67a236d2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-10-20 Bruno Haible + + Assume strchr() exists. + * configure.in: Remove check for strchr. + 2001-09-17 Bruno Haible * configure.in: Call gt_PREREQ_BACKUPFILE. diff --git a/configure.in b/configure.in index 55b3ec0b0..e4af6b2d2 100644 --- a/configure.in +++ b/configure.in @@ -66,8 +66,8 @@ AC_TYPE_PID_T dnl Checks for library functions. AC_FUNC_ALLOCA AC_FUNC_VPRINTF -AC_CHECK_FUNCS([getcwd mblen memcpy posix_spawn raise select strchr strerror \ -uname utime utimes]) +AC_CHECK_FUNCS([getcwd mblen memcpy posix_spawn raise select strerror uname \ +utime utimes]) AC_REPLACE_FUNCS([memset stpcpy stpncpy strcspn \ strcasecmp strncasecmp strpbrk strstr strtoul vasprintf]) AM_FUNC_GETLINE diff --git a/intl/ChangeLog b/intl/ChangeLog index 0c7c02dd4..2e69af0b6 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,12 @@ +2001-10-20 Bruno Haible + + Assume strchr() exists. (Without it, explodename.c wouldn't link + anyway.) + * dcigettext.c (strchr): Remove fallback definition; it conflicts with + the variable 'index' in plural_lookup. + * l10nflist.c (strchr): Likewise. + * localealias.c (strchr): Likewise. + 2001-09-24 Bruno Haible * loadmsgcat.c (_nl_init_domain_conv): Also enable transliteration diff --git a/intl/dcigettext.c b/intl/dcigettext.c index 5bae74c73..648d06e66 100644 --- a/intl/dcigettext.c +++ b/intl/dcigettext.c @@ -56,13 +56,7 @@ extern int errno; #include #include - #include -#if !HAVE_STRCHR && !defined _LIBC -# ifndef strchr -# define strchr index -# endif -#endif #if defined HAVE_UNISTD_H || defined _LIBC # include diff --git a/intl/l10nflist.c b/intl/l10nflist.c index 8e2605bc3..5f042325c 100644 --- a/intl/l10nflist.c +++ b/intl/l10nflist.c @@ -28,11 +28,6 @@ #endif #include -#if !HAVE_STRCHR && !defined _LIBC -# ifndef strchr -# define strchr index -# endif -#endif #if defined _LIBC || defined HAVE_ARGZ_H # include diff --git a/intl/localealias.c b/intl/localealias.c index f57d76442..9c90cad5e 100644 --- a/intl/localealias.c +++ b/intl/localealias.c @@ -49,13 +49,7 @@ char *alloca (); #endif #include - #include -#if !HAVE_STRCHR && !defined _LIBC -# ifndef strchr -# define strchr index -# endif -#endif #include "gettextP.h" diff --git a/lib/ChangeLog b/lib/ChangeLog index 80e56dd2a..0b86420b2 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2001-10-20 Bruno Haible + + Assume strchr() exists. + * system.h (strchr): Remove fallback definition. + 2001-09-17 Bruno Haible * backupfile.h: New file, from fileutils-4.1 with modifications. diff --git a/lib/system.h b/lib/system.h index 5d822e91a..966aa3de8 100644 --- a/lib/system.h +++ b/lib/system.h @@ -55,11 +55,6 @@ extern int strncasecmp PARAMS ((const char *__s1, const char *__s2, # define memcpy(D, S, N) bcopy ((S), (D), (N)) # endif #endif -#if !HAVE_STRCHR -# ifndef strchr -# define strchr index -# endif -#endif #ifdef __GNUC__ # ifndef alloca diff --git a/m4/ChangeLog b/m4/ChangeLog index c687e6386..24f9f126c 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2001-10-20 Bruno Haible + + Assume strchr() exists. + * gettext.m4 (AM_GNU_GETTEXT): Remove check for strchr. + 2001-09-17 Bruno Haible * backupfile.m4: New file. diff --git a/m4/gettext.m4 b/m4/gettext.m4 index 251d2d913..4362d8cba 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -58,8 +58,8 @@ AC_DEFUN([AM_GNU_GETTEXT], AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ stdlib.h string.h unistd.h sys/param.h]) AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \ -getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ -strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) +getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strcasecmp strdup \ +strtoul tsearch __argz_count __argz_stringify __argz_next]) AM_ICONV AM_LANGINFO_CODESET -- 2.47.3