summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--stdlib/gmp-impl.h8
2 files changed, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 961c549653..69c13509c6 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 a6594ffe4b..89693c4f0b 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)