This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-190-gbe75d75
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 15 Aug 2012 18:44:49 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-190-gbe75d75
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via be75d758071ac8d87149c0e806fc96dd3d277696 (commit)
from 7312ca90dc2fc5fd56440274f8b17cc8e6999581 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=be75d758071ac8d87149c0e806fc96dd3d277696
commit be75d758071ac8d87149c0e806fc96dd3d277696
Author: Roland McGrath <roland@hack.frob.com>
Date: Wed Aug 15 11:40:41 2012 -0700
Remove local redefinition of MAX macro.
diff --git a/ChangeLog b/ChangeLog
index 886c420..d1d4e9e 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 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
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 3 +++
string/str-two-way.h | 7 ++-----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 886c420..d1d4e9e 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 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
hooks/post-receive
--
GNU C Library master sources