summary refs log tree commit diff
path: root/string
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-08-15 11:40:41 -0700
committerRoland McGrath <roland@hack.frob.com>2012-08-15 11:40:41 -0700
commitbe75d758071ac8d87149c0e806fc96dd3d277696 (patch)
treecf4b9a32a4a2e31a64f5593392a90e955f822bf5 /string
parent7312ca90dc2fc5fd56440274f8b17cc8e6999581 (diff)
downloadglibc-be75d758071ac8d87149c0e806fc96dd3d277696.tar.gz
glibc-be75d758071ac8d87149c0e806fc96dd3d277696.tar.xz
glibc-be75d758071ac8d87149c0e806fc96dd3d277696.zip
Remove local redefinition of MAX macro.
Diffstat (limited to 'string')
-rw-r--r--string/str-two-way.h7
1 files changed, 2 insertions, 5 deletions
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