X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-misc.lisp;h=c636770a7667920687e2c0c2b5454d27cf8d4b7c;hb=5a9b7fcee7cd5374010d7a5b05463b84abc35079;hp=8363d7f5d4f3684e9feac27673e3f5a35dd48de0;hpb=4898ef32c639b1c7f4ee13a5ba566ce6debd03e6;p=sbcl.git

diff --git a/src/code/target-misc.lisp b/src/code/target-misc.lisp
index 8363d7f..c636770 100644
--- a/src/code/target-misc.lisp
+++ b/src/code/target-misc.lisp
@@ -53,13 +53,13 @@
     (#.sb!vm:closure-header-widetag
      (%closure-fun function))
     (#.sb!vm:funcallable-instance-header-widetag
-     (funcallable-instance-fun function))))
+     (%fun-fun (funcallable-instance-fun function)))))
 
 (defun %closure-values (object)
   (declare (function object))
-  (coerce (loop for index from 0 below (1- (get-closure-length object))
-                collect (%closure-index-ref object index))
-          'simple-vector))
+  (loop for index from 0
+     below (- (get-closure-length object) (1- sb!vm:closure-info-offset))
+     collect (%closure-index-ref object index)))
 
 (defun %fun-lambda-list (object)
   (%simple-fun-arglist (%fun-fun object)))
@@ -129,7 +129,8 @@
 (defun machine-instance ()
   #!+sb-doc
   "Return a string giving the name of the local machine."
-  (sb!unix:unix-gethostname))
+  #!+win32 "some-random-windows-box"
+  #!-win32 (sb!unix:unix-gethostname))
 
 (defvar *machine-version*)