This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[COMMITTED PATCH] avoid local redefinition of MAX macro
- From: Roland McGrath <roland at hack dot frob dot com>
- To: libc-alpha at sourceware dot org
- Date: Wed, 15 Aug 2012 11:44:56 -0700 (PDT)
- Subject: [COMMITTED PATCH] avoid local redefinition of MAX macro
* string/str-two-way.h: Include <sys/param.h>.
(MAX): Macro removed.
diff --git a/string/str-two-way.h b/string/str-two-way.h
index 1b2a8bd..22e7539 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