docs: memchr is no longer obsolete

* MODULES.html.sh: Move memchr from obsolete to string.h section.
* lib/string.in.h (memchr): Simplify logic.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index f88670c3db3395aee29505548984f8759d82dd6d..5bcd64db9e440b9f5b40b49c7d41c1d1faa8a606 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-15  Eric Blake  <ebb9@byu.net>
+
+       docs: memchr is no longer obsolete
+       * MODULES.html.sh: Move memchr from obsolete to string.h section.
+       * lib/string.in.h (memchr): Simplify logic.
+
 2009-06-14  Jim Meyering  <meyering@redhat.com>
 
        link-follow: fix the "checking..." message to not mention trailing slash

diff --git a/MODULES.html.sh b/MODULES.html.sh
index 06afa2d439426f57e558f692bb32e38bb1256afb..589915192ae0ac6103c93e54ece75013558a925c 100755 (executable)
--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -1606,7 +1606,6 @@ func_all_modules ()
   func_module exit
   func_module strtol
   func_module strtoul
-  func_module memchr
   func_module memcmp
   func_module memcpy
   func_module memmove
@@ -1770,6 +1769,7 @@ func_all_modules ()
 
   func_begin_table
   func_module bcopy
+  func_module memchr
   func_module memchr2
   func_module memmem
   func_module memmem-simple

diff --git a/lib/string.in.h b/lib/string.in.h
index c913cce238a3d630093b10d3efc5d3a36dd38033..9f98b0df975975fcb65dea05b01ba09fc3416a54 100644 (file)
--- a/lib/string.in.h
+++ b/lib/string.in.h
@@ -53,8 +53,6 @@ extern "C" {
 #if @GNULIB_MEMCHR@
 # if @REPLACE_MEMCHR@
 #  define memchr rpl_memchr
-# endif
-# if @REPLACE_MEMCHR@
 extern void *memchr (void const *__s, int __c, size_t __n)
   __attribute__ ((__pure__));
 # endif