0.7.5.11:

[sbcl.git] / src / code / signal.lisp

diff --git a/src/code/signal.lisp b/src/code/signal.lisp
index 14a8cf0..23cdd63 100644 (file)
--- a/src/code/signal.lisp
+++ b/src/code/signal.lisp
@@ -23,8 +23,8 @@
 ;;; sets *interrupt-pending* and returns without handling the signal.
 ;;;
 ;;; When we drop out the without interrupts, we check to see whether
-;;; *interrupt-pending* has been set. If so, we call
-;;; do-pending-interrupt, which generates a SIGTRAP. The C code
+;;; *INTERRUPT-PENDING* has been set. If so, we call
+;;; RECEIVE-PENDING-INTERRUPT, which generates a SIGTRAP. The C code
 ;;; invokes the handler for the saved signal instead of the SIGTRAP
 ;;; after replacing the signal mask in the signal context with the
 ;;; saved value. When that hander returns, the original signal mask is
@@ -43,7 +43,7 @@
 (sb!xc:defmacro without-interrupts (&body body)
   #!+sb-doc
   "Execute BODY in a context impervious to interrupts."
-  (let ((name (gensym)))
+  (let ((name (gensym "WITHOUT-INTERRUPTS-BODY-")))
     `(flet ((,name () ,@body))
        (if *interrupts-enabled*
           (unwind-protect
@@ -55,7 +55,7 @@
             ;; whether interrupts are pending before executing themselves
             ;; immediately?
             (when *interrupt-pending*
-              (do-pending-interrupt)))
+              (receive-pending-interrupt)))
           (,name)))))
 
 (sb!xc:defmacro with-interrupts (&body body)
@@ -68,7 +68,7 @@
           (,name)
           (let ((*interrupts-enabled* t))
             (when *interrupt-pending*
-              (do-pending-interrupt))
+              (receive-pending-interrupt))
             (,name))))))
 \f
 ;;;; utilities for dealing with signal names and numbers