projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed extra free
[pspp-builds.git]
/
src
/
alloc.h
diff --git
a/src/alloc.h
b/src/alloc.h
index b1b34d0fec11e452f1a2e049ed0caf0383f6b8a0..0f4492e391898342363b1df9ad4be672022cedb3 100644
(file)
--- a/
src/alloc.h
+++ b/
src/alloc.h
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
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
- 0211
1-1307
, USA. */
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston, MA
+ 0211
0-1301
, USA. */
#if !alloc_h
#define alloc_h 1
#if !alloc_h
#define alloc_h 1
@@
-23,14
+23,15
@@
#include <stddef.h>
/* malloc() wrapper functions. */
#include <stddef.h>
/* malloc() wrapper functions. */
-void *xmalloc (size_t size);
-void *xcalloc (size_t size);
-void *xrealloc (void *ptr, size_t size);
-char *xstrdup (const char *s);
-
\f
+#include "xalloc.h"
+
+void *nmalloc (size_t n, size_t s);
+
/* alloca() wrapper functions. */
#if defined (HAVE_ALLOCA) || defined (C_ALLOCA)
/* alloca() wrapper functions. */
#if defined (HAVE_ALLOCA) || defined (C_ALLOCA)
+#ifdef HAVE_ALLOCA_H
#include <alloca.h>
#include <alloca.h>
+#endif
#define local_alloc(X) alloca (X)
#define local_free(P) ((void) 0)
#else
#define local_alloc(X) alloca (X)
#define local_free(P) ((void) 0)
#else