OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove local redefinition of MAX macro.

This commit is contained in:
Roland McGrath 2012-08-15 11:40:41 -07:00
parent 7312ca90dc
commit be75d75807
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -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>.

7
string/str-two-way.h
View File

@ -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