X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Falloc.h;h=0f4492e391898342363b1df9ad4be672022cedb3;hb=53ceff2865473a6b561b521986fafd31a993a1a6;hp=50e7ab1f10bb6c418811051892f506202599c505;hpb=4944c86a9318bc5b5578ab145a95c116ffd2c9fd;p=pspp

diff --git a/src/alloc.h b/src/alloc.h
index 50e7ab1f10..0f4492e391 100644
--- a/src/alloc.h
+++ b/src/alloc.h
@@ -14,18 +14,29 @@
 
    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
 
 #include <stddef.h>
 
-/* Functions. */
-void *xmalloc (size_t size);
-void *xcalloc (size_t size);
-void *xrealloc (void *ptr, size_t size);
-char *xstrdup (const char *s);
+/* malloc() wrapper functions. */
+#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
+#define local_alloc(X) xmalloc (X)
+#define local_free(P) free (P)
+#endif
 
 #endif /* alloc.h */