about summary refs log tree commit diff
path: root/stdlib
diff options
context:
space:
mode:
Diffstat (limited to 'stdlib')
-rw-r--r--stdlib/gmp-impl.h4
-rw-r--r--stdlib/tst-strtol.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/stdlib/gmp-impl.h b/stdlib/gmp-impl.h
index 62e96da952..837fcfdb28 100644
--- a/stdlib/gmp-impl.h
+++ b/stdlib/gmp-impl.h
@@ -66,8 +66,12 @@ MA 02111-1307, USA. */
 #endif
 
 #define ABS(x) (x >= 0 ? x : -x)
+#ifndef MIN
 #define MIN(l,o) ((l) < (o) ? (l) : (o))
+#endif
+#ifndef MAX
 #define MAX(h,i) ((h) > (i) ? (h) : (i))
+#endif
 
 /* Field access macros.  */
 #define SIZ(x) ((x)->_mp_size)
diff --git a/stdlib/tst-strtol.c b/stdlib/tst-strtol.c
index 1566364b32..58878f236e 100644
--- a/stdlib/tst-strtol.c
+++ b/stdlib/tst-strtol.c
@@ -25,8 +25,8 @@ static const struct ltest tests[] =
     { "2147483648",	2147483647,	0,	0,	ERANGE },
     { "214748364888",	2147483647,	0,	0,	ERANGE },
     { "2147483650",	2147483647,	0,	0,	ERANGE },
-    { "-2147483649",	-2147483648,	0,	0,	ERANGE },
-    { "-2147483648",	-2147483648,	0,	0,	0 },
+    { "-2147483649",	0x80000000,	0,	0,	ERANGE },
+    { "-2147483648",	0x80000000,	0,	0,	0 },
     { "0123",		0123,		0,	0,	0 },
     { "0x1122334455z",	2147483647,	16,	'z',	ERANGE },
     { "0x0xc",		0,		0,	'x',	0 },