X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Falloc.h;h=0f4492e391898342363b1df9ad4be672022cedb3;hb=bf71a28cc57afd259bb086ac5dfde5b685ba7995;hp=b1b34d0fec11e452f1a2e049ed0caf0383f6b8a0;hpb=7b98b3a4f58f6dc5a8e9cbc188b627966d5e652d;p=pspp-builds.git

diff --git a/src/alloc.h b/src/alloc.h
index b1b34d0f..0f4492e3 100644
--- 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
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #if !alloc_h
 #define alloc_h 1
@@ -23,14 +23,15 @@
 #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);
-
+#include "xalloc.h"
+
+void *nmalloc (size_t n, size_t s);
+
 /* alloca() wrapper functions. */
 #if defined (HAVE_ALLOCA) || defined (C_ALLOCA)
+#ifdef HAVE_ALLOCA_H
 #include <alloca.h>
+#endif
 #define local_alloc(X) alloca (X)
 #define local_free(P) ((void) 0)
 #else