X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Frun-program.lisp;h=6fcfa5555baad1d9727bcdfe80eb514721df5a6a;hb=90ca09b75fbc3b63b2f7d09c67b04b866dd783f6;hp=0e73a960cd9754ac3d625586055f702bfcd266cf;hpb=545fa4548b327804cf78afe38a2ecd94ced86162;p=sbcl.git

diff --git a/src/code/run-program.lisp b/src/code/run-program.lisp
index 0e73a96..6fcfa55 100644
--- a/src/code/run-program.lisp
+++ b/src/code/run-program.lisp
@@ -45,7 +45,7 @@
 ;;;; which (at least in sbcl-0.6.10 on Red Hat Linux 6.2) is not
 ;;;; visible at GENESIS time.
 
-(def-alien-variable "environ" (* c-string))
+(define-alien-variable "environ" (* c-string))
 (push (lambda ()
 	;; We redo this here to protect ourselves from this scenario:
 	;;   * Build under one version of shared lib, save a core.
@@ -59,7 +59,7 @@
 	;; alien code be preserved across a save/load cycle, but this
 	;; problem with alien variables is only one of several
 	;; problems which'd need to be solved before that can happen.)
-        (def-alien-variable "environ" (* c-string)))
+        (define-alien-variable "environ" (* c-string)))
       *after-save-initializations*)
 
 (defun posix-environ ()
@@ -108,7 +108,7 @@
 
 ;;;; Import wait3(2) from Unix.
 
-(sb-alien:def-alien-routine ("wait3" c-wait3) sb-c-call:int
+(sb-alien:define-alien-routine ("wait3" c-wait3) sb-c-call:int
   (status sb-c-call:int :out)
   (options sb-c-call:int)
   (rusage sb-c-call:int))
@@ -174,7 +174,7 @@
 (defmethod print-object ((process process) stream)
   (print-unreadable-object (process stream :type t)
     (format stream
-	    "~D ~S"
+	    "~W ~S"
 	    (process-pid process)
 	    (process-status process)))
   process)
@@ -305,7 +305,7 @@
 (defvar *handlers-installed* nil)
 
 #+FreeBSD
-(def-alien-type nil
+(define-alien-type nil
   (struct sgttyb
 	  (sg-ispeed sb-c-call:char)	; input speed
 	  (sg-ospeed sb-c-call:char)	; output speed
@@ -313,7 +313,7 @@
 	  (sg-kill sb-c-call:char)	; kill character
 	  (sg-flags sb-c-call:short)))	; mode flags
 #+OpenBSD
-(def-alien-type nil
+(define-alien-type nil
   (struct sgttyb
 	  (sg-four sb-c-call:int)
 	  (sg-chars (array sb-c-call:char 4))
@@ -380,7 +380,7 @@
       (when (streamp pty)
 	(multiple-value-bind (new-fd errno) (sb-unix:unix-dup master)
 	  (unless new-fd
-	    (error "couldn't SB-UNIX:UNIX-DUP ~D: ~A" master (strerror errno)))
+	    (error "couldn't SB-UNIX:UNIX-DUP ~W: ~A" master (strerror errno)))
 	  (push new-fd *close-on-error*)
 	  (copy-descriptor-to-stream new-fd pty cookie)))
       (values name
@@ -415,7 +415,7 @@
 					 (* sb-vm:vector-data-offset
 					    sb-vm:n-word-bits)
 					 string-sap 0
-					 (* (1+ n) sb-vm:byte-bits))
+					 (* (1+ n) sb-vm:n-byte-bits))
 	  ;; Blast the pointer to the string into place.
 	  (setf (sap-ref-sap vec-sap i) string-sap)
 	  (setf string-sap (sap+ string-sap (round-bytes-to-words (1+ n))))
@@ -435,7 +435,7 @@
 	     ,@body)
 	(sb-sys:deallocate-system-memory ,sap ,size)))))
 
-(sb-alien:def-alien-routine spawn sb-c-call:int
+(sb-alien:define-alien-routine spawn sb-c-call:int
   (program sb-c-call:c-string)
   (argv (* sb-c-call:c-string))
   (envp (* sb-c-call:c-string))
@@ -714,7 +714,7 @@
 				    (alien-sap buf) 0
 				    string (* sb-vm:vector-data-offset
 					      sb-vm:n-word-bits)
-				    (* count sb-vm:byte-bits))
+				    (* count sb-vm:n-byte-bits))
 				   (write-string string stream
 						 :end count)))))))))))