From be75d758071ac8d87149c0e806fc96dd3d277696 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@hack.frob.com>
Date: Wed, 15 Aug 2012 11:40:41 -0700
Subject: [PATCH] Remove local redefinition of MAX macro.

---
 ChangeLog            | 3 +++
 string/str-two-way.h | 7 ++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 886c42045d..d1d4e9e959 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-08-15  Roland McGrath  <roland@hack.frob.com>
 
+	* string/str-two-way.h: Include <sys/param.h>.
+	(MAX): Macro removed.
+
 	* sysdeps/x86_64/multiarch/strstr-c.c: Add copyright header.
 	Move #define and #undef of memmove to just before and after
 	including <string.h>.
diff --git a/string/str-two-way.h b/string/str-two-way.h
index 1b2a8bd545..22e75393dc 100644
--- a/string/str-two-way.h
+++ b/string/str-two-way.h
@@ -1,5 +1,5 @@
 /* Byte-wise substring search, using the Two-Way algorithm.
-   Copyright (C) 2008, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2008-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Eric Blake <ebb9@byu.net>, 2008.
 
@@ -43,6 +43,7 @@
 
 #include <limits.h>
 #include <stdint.h>
+#include <sys/param.h>                  /* Defines MAX.  */
 
 /* We use the Two-Way string matching algorithm, which guarantees
    linear complexity with constant space.  Additionally, for long
@@ -67,10 +68,6 @@
 # define LONG_NEEDLE_THRESHOLD SIZE_MAX
 #endif
 
-#ifndef MAX
-# define MAX(a, b) ((a < b) ? (b) : (a))
-#endif
-
 #ifndef CANON_ELEMENT
 # define CANON_ELEMENT(c) c
 #endif