r10985: actually apply diff

diff --git a/processes.lisp b/processes.lisp
index 5b2c09d2eb78714062db17c00b6a7d0c27cf80ff..70de5fb0178859c4e7331d3bc27a18f810badd5b 100644 (file)
--- a/processes.lisp
+++ b/processes.lisp
@@ -17,7 +17,7 @@
   #+allegro (mp:process-run-function name func)
   #+cmu (mp:make-process func :name name)
   #+lispworks (mp:process-run-function name nil func)
-  #+sb-thread (sb-thread:make-thread func)
+  #+sb-thread (sb-thread:make-thread func :name name)
   #+openmcl (ccl:process-run-function name func)
   #-(or allegro cmu lispworks sb-thread openmcl) (funcall func)
   )

diff --git a/sockets.lisp b/sockets.lisp
index cbadc07c608c70f377e1b28cddeab97552e5b72e..2d9a8ff0765072e03b5c43d5916f87a90fd7b110 100644 (file)
--- a/sockets.lisp
+++ b/sockets.lisp
@@ -84,7 +84,7 @@ setsockopt SO_REUSEADDR if :reuse is not nil"
     (let ((sock (sb-bsd-sockets:socket-accept listener)))
       (values
        (sb-bsd-sockets:socket-make-stream
-       sock :element-type 'base-char :input t :output t)
+       sock :element-type :default :input t :output t)
        sock)))
   #+openmcl 
   (let ((sock (ccl:accept-connection listener :wait t)))
@@ -115,7 +115,8 @@ setsockopt SO_REUSEADDR if :reuse is not nil"
 
 
 (defun close-active-socket (socket)
-  (close socket))
+  #+sbcl (sb-bsd-sockets:socket-close socket)
+  #-sbcl (close socket))
 
 (defun ipaddr-to-dotted (ipaddr &key values)
   "Convert from 32-bit integer to dotted string."
@@ -178,7 +179,7 @@ setsockopt SO_REUSEADDR if :reuse is not nil"
     (sb-bsd-sockets:socket-connect sock (lookup-hostname server) port)
     (values
      (sb-bsd-sockets:socket-make-stream
-      sock :input t :output t :element-type 'base-char)
+      sock :input t :output t :element-type :default)
      sock))
   #+cmu
   (let ((sock (ext:connect-to-inet-socket server port)))