From ce6ed4bae6367d6b6ee840b7c0461865ace15dd8 Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Sat, 3 Oct 1998 19:51:05 +0000 Subject: [PATCH] * alloca.c: Use scm_must_malloc to obtain storage. Hopefully this works; I can't conveniently test it myself. (Thanks to Dvid Tillman for the bug report.) --- libguile/alloca.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/libguile/alloca.c b/libguile/alloca.c index 25b0ab498..b36c32aec 100644 --- a/libguile/alloca.c +++ b/libguile/alloca.c @@ -25,6 +25,9 @@ #include #endif +#define malloc(size) (scm_must_malloc ((size), "alloca emulation")) +extern char *scm_must_malloc (); + #ifdef HAVE_STRING_H #include #endif @@ -77,21 +80,6 @@ typedef char *pointer; #define NULL 0 #endif -/* Different portions of Emacs need to call different versions of - malloc. The Emacs executable needs alloca to call xmalloc, because - ordinary malloc isn't protected from input signals. On the other - hand, the utilities in lib-src need alloca to call malloc; some of - them are very simple, and don't have an xmalloc routine. - - Non-Emacs programs expect this to call use xmalloc. - - Callers below should use malloc. */ - -#ifndef emacs -#define malloc xmalloc -#endif -extern pointer malloc (); - /* Define STACK_DIRECTION if you know the direction of stack growth for your system; otherwise it will be automatically deduced at run-time.