X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Frun-program.lisp;h=6fcfa5555baad1d9727bcdfe80eb514721df5a6a;hb=cd176690400f8b6fa23faa4dc6fa8494bcbce480;hp=db90d0a019d82484ff1a676da83b42288c450f39;hpb=50305b602c3953440af716137a56f50cd204375d;p=sbcl.git diff --git a/src/code/run-program.lisp b/src/code/run-program.lisp index db90d0a..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 @@ -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))