projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include unlocked-io.h. Remove unnecessary block of defines.
[gnulib.git]
/
lib
/
malloc.c
diff --git
a/lib/malloc.c
b/lib/malloc.c
index
b859e58
..
a75da9b
100644
(file)
--- a/
lib/malloc.c
+++ b/
lib/malloc.c
@@
-1,5
+1,5
@@
-/*
Work around bug on some systems where malloc (0) fails
.
- Copyright (C) 1997 Free Software Foundation, Inc.
+/*
malloc() function that is glibc compatible
.
+ Copyright (C) 1997
, 1998
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-13,7
+13,7
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
/* written by Jim Meyering */
/* written by Jim Meyering */
@@
-22,16
+22,13
@@
#endif
#undef malloc
#endif
#undef malloc
-#include <sys/types.h>
-
-char *malloc ();
+#include <stdlib.h>
/* Allocate an N-byte block of memory from the heap.
If N is zero, allocate a 1-byte block. */
/* Allocate an N-byte block of memory from the heap.
If N is zero, allocate a 1-byte block. */
-char *
-rpl_malloc (n)
- size_t n;
+void *
+rpl_malloc (size_t n)
{
if (n == 0)
n = 1;
{
if (n == 0)
n = 1;