merge from gcc

This commit is contained in:
DJ Delorie 2002-03-04 00:55:25 +00:00
parent 12eed87b7c
commit 6e9980f54d
2 changed files with 6 additions and 2 deletions

View file

@ -1,3 +1,7 @@
2002-03-03 Neil Booth <neil@daikokuya.demon.co.uk>
* xmalloc.c (xmalloc_fail): Clarify error message.
2002-02-21 Jim Blandy <jimb@redhat.com>
* splay-tree.c (splay_tree_xmalloc_allocate,

View file

@ -120,12 +120,12 @@ xmalloc_failed (size)
else
allocated = (char *) sbrk (0) - (char *) &environ;
fprintf (stderr,
"\n%s%sCannot allocate %lu bytes after allocating %lu bytes\n",
"\n%s%sout of memory allocating %lu bytes after allocating %lu bytes\n",
name, *name ? ": " : "",
(unsigned long) size, (unsigned long) allocated);
#else /* HAVE_SBRK */
fprintf (stderr,
"\n%s%sCannot allocate %lu bytes\n",
"\n%s%sout of memory allocating %lu bytes\n",
name, *name ? ": " : "",
(unsigned long) size);
#endif /* HAVE_SBRK */