# HG changeset patch
# User Eric Blake <ebb9@byu.net>
# Date 1210853771 21600
# Node ID 5be97759685ca09f2ee92e386da95878c5fa4212
# Parent  cc7bfc9f7fc148e101d9bfa2e2329b6483d3bc5f
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 -r cc7bfc9f7fc1 -r 5be97759685c ChangeLog
--- a/ChangeLog	Thu May 15 08:50:06 2008 +0200
+++ b/ChangeLog	Thu May 15 06:16:11 2008 -0600
@@ -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 -r cc7bfc9f7fc1 -r 5be97759685c doc/glibc-functions/memmem.texi
--- a/doc/glibc-functions/memmem.texi	Thu May 15 08:50:06 2008 +0200
+++ b/doc/glibc-functions/memmem.texi	Thu May 15 06:16:11 2008 -0600
@@ -24,7 +24,7 @@
 @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 -r cc7bfc9f7fc1 -r 5be97759685c doc/glibc-functions/strcasestr.texi
--- a/doc/glibc-functions/strcasestr.texi	Thu May 15 08:50:06 2008 +0200
+++ b/doc/glibc-functions/strcasestr.texi	Thu May 15 06:16:11 2008 -0600
@@ -17,7 +17,7 @@
 @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 -r cc7bfc9f7fc1 -r 5be97759685c doc/posix-functions/strstr.texi
--- a/doc/posix-functions/strstr.texi	Thu May 15 08:50:06 2008 +0200
+++ b/doc/posix-functions/strstr.texi	Thu May 15 06:16:11 2008 -0600
@@ -11,7 +11,7 @@
 @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 -r cc7bfc9f7fc1 -r 5be97759685c lib/str-two-way.h
--- a/lib/str-two-way.h	Thu May 15 08:50:06 2008 +0200
+++ b/lib/str-two-way.h	Thu May 15 06:16:11 2008 -0600
@@ -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