about summary refs log tree commit diff
path: root/stdlib
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1996-12-22 00:32:43 +0000
committerUlrich Drepper <drepper@redhat.com>1996-12-22 00:32:43 +0000
commit01c901a56b165e57a17db349cc110f84f1b839c7 (patch)
tree04ee6d96167715cf56e2f009837fd6cc3d8347bf /stdlib
parent7e3be507eed53cfe516ec101f312dac160e43bad (diff)
downloadglibc-01c901a56b165e57a17db349cc110f84f1b839c7.tar.gz
glibc-01c901a56b165e57a17db349cc110f84f1b839c7.tar.xz
glibc-01c901a56b165e57a17db349cc110f84f1b839c7.zip
Sun Dec 22 00:01:27 1996  Ulrich Drepper  <drepper@cygnus.com>

	* inet/getnetgrent.c: Reformat copyright.

	* inet/getnetgrent_r.c (__internal_endnetgrent): Correct comment.
	(__internal_getnetgrent): Rename to __internal_getnetgrent_r as
	required in change nis/nss_compat/* at Thu Dec 19 14:24:50 1996.
	Reported by Thorsten Kukuk <kukuk@weber.uni-paderborn.de>.

	* nss/nss_files/files-netgrp.c: Fix typo.
	* login/utmp_db.c: Comment out unused variables.
	* misc/tst-dirname.c: Provide prototype for main (for now).
	* new-malloc/mcheck-init.c: Include <mcheck.h>.
	* new-malloc/obstack.c: Provide real prototypes.

	* resolv/base64.c (b64_ntop): Use size_t as type of `i', not int.
	(b64_pton): Likewise for `tarindex'.
	* resolv/nsap_addr.c (inet_nsap_addr): Add cast to prevent warning.

	* stdio-common/Makefile: Add CFLAGS-vfprintf.c to prevent warning.
	* stdio-common/printf-parse.h: Remove definition of MIN and MAX.
	* stdio-common/printf-prs.c: Include <sys/param.h> to get MIN and MAX.
	* stdio-common/vfprintf.c: Likewise.
	* stdlib/gmp-impl.h: Only define MIN and MAX if not already done.
	* stdlib/tst-strtol.c: Don't use -2147483648 as unsigned long value.

	* sysdeps/generic/Makefile ($(subdir)=string): Define
	CFLAGS-wordcopy.c to prevent warning.
	* sysdeps/generic/mul_n.c (mpn_mul_n): Don't define as inline.
	* sysdeps/generic/wordcopy.c: De-ANSI-declfy.
	* sysdeps/i386/Makefile ($(subdir)=elf): Define CFLAGS-rtld.c
	to prevent warning.
	* sysdeps/i386/dl-machine.h: Correct copyright.
	* sysdeps/unix/closedir.c: Likewise.
	* sysdeps/unix/dirstream.h: Likewise.
	* sysdeps/unix/opendir.c: Likewise.
	* time/tzset.c: Add prototype for __tzset_internal.

	* sysdeps/gnu/utmpbits.h (enum utlogin): Comment out since the
	way it is supposed to work is not yet known.
	(struct utmp): Remove ut_login and ut_syslen field for now.

Sat Dec 21 16:23:54 1996  Ulrich Drepper  <drepper@cygnus.com>

	* time/strftime.c: Fix another bug in handling flags made it
	impossible to use the `-', `_', or `0' flag.
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 },