Assume strchr() exists.

diff --git a/ChangeLog b/ChangeLog
index 36488c44821089d96b01122a873236afbddd8f31..67a236d2d1713515c4e3cf49d1456667d23aecbc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-20  Bruno Haible  <haible@clisp.cons.org>
+
+       Assume strchr() exists.
+       * configure.in: Remove check for strchr.
+
 2001-09-17  Bruno Haible  <haible@clisp.cons.org>
 
        * configure.in: Call gt_PREREQ_BACKUPFILE.

diff --git a/configure.in b/configure.in
index 55b3ec0b03c405d76cdd21874298f98bbb5ffcfb..e4af6b2d2ed6e8d31c79f75695d3bfb258f7b245 100644 (file)
--- 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 0c7c02dd4501839985f0267b9152e03dc3e976c1..2e69af0b6e2e8c9ea54ee787ddcac8ef00d955ee 100644 (file)
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,12 @@
+2001-10-20  Bruno Haible  <haible@clisp.cons.org>
+
+       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  <haible@clisp.cons.org>
 
        * loadmsgcat.c (_nl_init_domain_conv): Also enable transliteration

diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index 5bae74c73b325bc3d20bdc6b02fb75bf0d7f7124..648d06e6693f5322e44e2cf8617b608d2f8bea9d 100644 (file)
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -56,13 +56,7 @@ extern int errno;
 
 #include <stddef.h>
 #include <stdlib.h>
-
 #include <string.h>
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
 
 #if defined HAVE_UNISTD_H || defined _LIBC
 # include <unistd.h>

diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 8e2605bc3e5e771af41952b54f694fa6109ba6ef..5f042325ccd11e3c7f9d14c3dfbf9e03768bb960 100644 (file)
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -28,11 +28,6 @@
 #endif
 
 #include <string.h>
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
 
 #if defined _LIBC || defined HAVE_ARGZ_H
 # include <argz.h>

diff --git a/intl/localealias.c b/intl/localealias.c
index f57d76442eb40a4bb50de90f2a590024cb86c89e..9c90cad5efb415f0145f3d6d0b07d6661e1802ef 100644 (file)
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -49,13 +49,7 @@ char *alloca ();
 #endif
 
 #include <stdlib.h>
-
 #include <string.h>
-#if !HAVE_STRCHR && !defined _LIBC
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
 
 #include "gettextP.h"
 

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 80e56dd2a90b1c03b027c3c79918ca9d8cfa2693..0b86420b270c9fb95d9b171865061aa143328d97 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-20  Bruno Haible  <haible@clisp.cons.org>
+
+       Assume strchr() exists.
+       * system.h (strchr): Remove fallback definition.
+
 2001-09-17  Bruno Haible  <haible@clisp.cons.org>
 
        * backupfile.h: New file, from fileutils-4.1 with modifications.

diff --git a/lib/system.h b/lib/system.h
index 5d822e91a3c1285f33096a6d4754a48ff7e76fc3..966aa3de8fd353c3c78a67071d1f2d6f494ad228 100644 (file)
--- 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 c687e6386c371da0bface0e97d3a32b53dd77c1e..24f9f126cf485d825d6284635c75ca055d46d22d 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-20  Bruno Haible  <haible@clisp.cons.org>
+
+       Assume strchr() exists.
+       * gettext.m4 (AM_GNU_GETTEXT): Remove check for strchr.
+
 2001-09-17  Bruno Haible  <haible@clisp.cons.org>
 
        * backupfile.m4: New file.

diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 251d2d9130fcaf5ac91e697455c511853241174c..4362d8cba1b22be3b464f31e5dc1253651a2639b 100644 (file)
--- 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