X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fsignal.lisp;h=23cdd63ae0603684eaf487acc16a267d4552a00b;hb=b062a0cffdc3e1706a67c487d2bc5e406c104893;hp=248a1027895a4976c1f252c6efec312e49a52c97;hpb=f61bddabbb69f1347b81b8ab76e709635a7a0739;p=sbcl.git

diff --git a/src/code/signal.lisp b/src/code/signal.lisp
index 248a102..23cdd63 100644
--- 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))))))
 
 ;;;; utilities for dealing with signal names and numbers
@@ -77,9 +77,9 @@
 	    (:constructor make-unix-signal (%name %number))
 	    (:copier nil))
   ;; signal keyword (e.g. :SIGINT for the Unix SIGINT signal)
-  (%name   (required-argument) :type keyword :read-only t)
+  (%name   (missing-arg) :type keyword :read-only t)
   ;; signal number
-  (%number (required-argument) :type integer :read-only t))
+  (%number (missing-arg) :type integer :read-only t))
 
 ;;; list of all defined UNIX-SIGNALs
 (defvar *unix-signals* nil)