summaryrefslogtreecommitdiff
path: root/lib/malloc
diff options
context:
space:
mode:
Diffstat (limited to 'lib/malloc')
-rw-r--r--lib/malloc/malloc.c6
-rw-r--r--lib/malloc/table.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/malloc/malloc.c b/lib/malloc/malloc.c
index 94806972..439f8ef1 100644
--- a/lib/malloc/malloc.c
+++ b/lib/malloc/malloc.c
@@ -319,7 +319,7 @@ extern char *sbrk ();
#endif /* !HAVE_DECL_SBRK */
#ifdef SHELL
-extern int interrupt_immediately, running_trap;
+extern int running_trap;
extern int signal_is_trapped PARAMS((int));
#endif
@@ -620,9 +620,9 @@ morecore (nu)
blocked_sigs = 0;
#ifdef SHELL
# if defined (SIGCHLD)
- if (interrupt_immediately || running_trap || signal_is_trapped (SIGINT) || signal_is_trapped (SIGCHLD))
+ if (running_trap || signal_is_trapped (SIGINT) || signal_is_trapped (SIGCHLD))
# else
- if (interrupt_immediately || running_trap || signal_is_trapped (SIGINT))
+ if (running_trap || signal_is_trapped (SIGINT))
# endif
#endif
{
diff --git a/lib/malloc/table.c b/lib/malloc/table.c
index b587eea6..e6acbf4a 100644
--- a/lib/malloc/table.c
+++ b/lib/malloc/table.c
@@ -29,7 +29,7 @@
#include "table.h"
#ifdef SHELL
-extern int interrupt_immediately, running_trap;
+extern int running_trap;
extern int signal_is_trapped PARAMS((int));
#endif
@@ -174,7 +174,7 @@ mregister_alloc (tag, mem, size, file, line)
/* Block all signals in case we are executed from a signal handler. */
blocked_sigs = 0;
#ifdef SHELL
- if (interrupt_immediately || running_trap || signal_is_trapped (SIGINT) || signal_is_trapped (SIGCHLD))
+ if (running_trap || signal_is_trapped (SIGINT) || signal_is_trapped (SIGCHLD))
#endif
{
_malloc_block_signals (&set, &oset);
@@ -229,7 +229,7 @@ mregister_free (mem, size, file, line)
/* Block all signals in case we are executed from a signal handler. */
blocked_sigs = 0;
#ifdef SHELL
- if (interrupt_immediately || running_trap || signal_is_trapped (SIGINT) || signal_is_trapped (SIGCHLD))
+ if (running_trap || signal_is_trapped (SIGINT) || signal_is_trapped (SIGCHLD))
#endif
{
_malloc_block_signals (&set, &oset);