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.25-384-g09103e4
- From: gftg at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 1 Jun 2017 23:47:45 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.25-384-g09103e4
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 09103e40252454e906a0b8543a142fc96b4c17c1 (commit)
from 6da85a0daf65a407f942622e23fc20b37b80168c (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=09103e40252454e906a0b8543a142fc96b4c17c1
commit 09103e40252454e906a0b8543a142fc96b4c17c1
Author: Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com>
Date: Fri May 26 19:29:20 2017 -0300
Include sys/param.h in stdlib/gmp-impl.h instead of redefining MAX/MIN
In stdlib/gmp-impl.h, the macros MAX and MIN are defined exactly the same
as in sys/param.h. This patch removes the redefinition and makes
gmp-impl.h include sys/param.h instead.
Tested for powerpc64le and s390x.
* stdlib/gmp-impl.h: Include sys/param.h instead of redefining the
macros MAX and MIN.
diff --git a/ChangeLog b/ChangeLog
index 961c549..69c1350 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-01 Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com>
+
+ * stdlib/gmp-impl.h: Include sys/param.h instead of redefining the
+ macros MAX and MIN.
+
2017-06-01 Joseph Myers <joseph@codesourcery.com>
* conform/data/signal.h-data (sa_sigaction): Do not expect for
diff --git a/stdlib/gmp-impl.h b/stdlib/gmp-impl.h
index a6594ff..89693c4 100644
--- a/stdlib/gmp-impl.h
+++ b/stdlib/gmp-impl.h
@@ -64,12 +64,8 @@ along with the GNU MP Library; see the file COPYING.LIB. If not, see
#define inline /* Empty */
#endif
-#ifndef MIN
-#define MIN(l,o) ((l) < (o) ? (l) : (o))
-#endif
-#ifndef MAX
-#define MAX(h,i) ((h) > (i) ? (h) : (i))
-#endif
+/* Get MAX/MIN macros. */
+#include <sys/param.h>
/* Field access macros. */
#define SIZ(x) ((x)->_mp_size)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
stdlib/gmp-impl.h | 8 ++------
2 files changed, 7 insertions(+), 6 deletions(-)
hooks/post-receive
--
GNU C Library master sources