Glibc finally accepted the memmem speedup code, bugzilla #5514.

* doc/glibc-functions/memmem.texi (memmem): Mention last broken
glibc version.
* doc/glibc-functions/strcasestr.texi (strcasestr): Likewise.
* doc/posix-functions/strstr.texi (strstr): Likewise.
* lib/str-two-way.h (MAX): Sychronize with glibc.

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

diff --git a/ChangeLog b/ChangeLog
index 6a2635b088b953ae922e51677156cc4cb68fcf4d..f563409f9064a00ed14a2475090d3d994ae57f8b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-05-15  Eric Blake  <ebb9@byu.net>
+
+       Glibc finally accepted the memmem speedup code, bugzilla #5514.
+       * doc/glibc-functions/memmem.texi (memmem): Mention last broken
+       glibc version.
+       * doc/glibc-functions/strcasestr.texi (strcasestr): Likewise.
+       * doc/posix-functions/strstr.texi (strstr): Likewise.
+       * lib/str-two-way.h (MAX): Sychronize with glibc.
+
 2008-05-15  Paolo Bonzini  <bonzini@gnu.org>
 
        * lib/regcomp.c (optimize_utf8): Add a note on why we test

diff --git a/doc/glibc-functions/memmem.texi b/doc/glibc-functions/memmem.texi
index a9ec7de27d7ede26d2c7878caef5bdcdbcc58d05..c7e3d739f4c4b86719385014ba370a98899a3fea 100644 (file)
--- a/doc/glibc-functions/memmem.texi
+++ b/doc/glibc-functions/memmem.texi
@@ -24,7 +24,7 @@ glibc <= 2.0, Cygwin 1.5.x.
 @item
 This function has quadratic instead of linear worst-case complexity on some
 platforms:
-glibc 2.6.1, FreeBSD 6.2, NetBSD 3.0, AIX 5.1, Cygwin 1.5.x.
+glibc 2.8, FreeBSD 6.2, NetBSD 3.0, AIX 5.1, Cygwin 1.5.x.
 @end itemize
 
 Portability problems not fixed by Gnulib:

diff --git a/doc/glibc-functions/strcasestr.texi b/doc/glibc-functions/strcasestr.texi
index 4df018cd967142018c8e53deaafa5d3c092d0368..c5d1c65fc965547722042a508da4e1cc4a4f7920 100644 (file)
--- a/doc/glibc-functions/strcasestr.texi
+++ b/doc/glibc-functions/strcasestr.texi
@@ -17,7 +17,7 @@ Portability problems fixed by Gnulib module @code{strcasestr}:
 @item
 This function has quadratic instead of linear worst-case complexity on some
 platforms:
-glibc 2.6.1, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0.
+glibc 2.8, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0.
 @end itemize
 
 Portability problems not fixed by Gnulib:

diff --git a/doc/posix-functions/strstr.texi b/doc/posix-functions/strstr.texi
index 417a035ef9fe637b1d62549009eb44706af048af..796a14fb6cb822285a1863af1bfee84b7cf7e3c4 100644 (file)
--- a/doc/posix-functions/strstr.texi
+++ b/doc/posix-functions/strstr.texi
@@ -11,7 +11,7 @@ Portability problems fixed by Gnulib:
 @item
 This function has quadratic instead of linear worst-case complexity on some
 platforms:
-glibc 2.6.1, MacOS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin 1.5.x, mingw.
+glibc 2.8, MacOS X 10.3, FreeBSD 6.2, NetBSD 3.0, OpenBSD 4.0, AIX 5.1, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 10, Cygwin 1.5.x, mingw.
 @end itemize
 
 Portability problems not fixed by Gnulib:

diff --git a/lib/str-two-way.h b/lib/str-two-way.h
index d144ac95b4289c73e9373d03b9eaa092d82080c3..b0338a70a1a9e02d80a17d007fcfa4c6ff4dd02d 100644 (file)
--- a/lib/str-two-way.h
+++ b/lib/str-two-way.h
@@ -67,7 +67,9 @@
 # define LONG_NEEDLE_THRESHOLD SIZE_MAX
 #endif
 
-#define MAX(a, b) ((a < b) ? (b) : (a))
+#ifndef MAX
+# define MAX(a, b) ((a < b) ? (b) : (a))
+#endif
 
 #ifndef CANON_ELEMENT
 # define CANON_ELEMENT(c) c