[bknr-cvs] hans changed trunk/

[BKNR Commits]

Revision: 3436
Author: hans
URL: http://bknr.net/trac/changeset/3436

Some small cmucl fixes.

U   trunk/bknr/datastore/src/utils/acl-mp-compat.lisp
U   trunk/bknr/modules/mail/smtp-server.lisp
U   trunk/thirdparty/closure-common/closure-common.asd
U   trunk/thirdparty/slime/swank-cmucl.lisp

Modified: trunk/bknr/datastore/src/utils/acl-mp-compat.lisp
===================================================================
--- trunk/bknr/datastore/src/utils/acl-mp-compat.lisp	2008-07-14 14:18:51 UTC (rev 3435)
+++ trunk/bknr/datastore/src/utils/acl-mp-compat.lisp	2008-07-14 14:33:26 UTC (rev 3436)
@@ -8,8 +8,10 @@
   (mp:make-process-lock :name name)
   #+sbcl
   (sb-thread:make-mutex :name name)
-  #+cmu
+  #+(and cmu x86)
   (mp:make-lock name)
+  #+(and cmu (not x86))
+  (declare (ignore name))
   #+openmcl
   (ccl:make-lock name)
   #+lispworks

Modified: trunk/bknr/modules/mail/smtp-server.lisp
===================================================================
--- trunk/bknr/modules/mail/smtp-server.lisp	2008-07-14 14:18:51 UTC (rev 3435)
+++ trunk/bknr/modules/mail/smtp-server.lisp	2008-07-14 14:33:26 UTC (rev 3436)
@@ -87,14 +87,10 @@
 (defun handle-smtp-client (client-socket)
   (handle-session (make-instance 'smtp-client :socket client-socket)))
 
-#+cmu
 (defun smtp-server (&key (port 2525))
-  (let ((server-socket (socket:make-socket :connect :passive :local-port port :reuse-address t)))
-    (unwind-protect
-	 (loop
-	  (let* ((client-socket (socket:accept-connection server-socket)))
-	    (unwind-protect
-		 (handle-smtp-client client-socket)
-	      (close client-socket))))
-      (format t ";; smtp server finished, closing~%")
-      (close server-socket))))
+  (usocket:with-socket-listener (server-socket :local-port port :reuse-address t)
+    (loop
+       (let* ((client-socket (usocket:socket-accept server-socket)))
+         (unwind-protect
+              (handle-smtp-client client-socket)
+           (close client-socket))))))

Modified: trunk/thirdparty/closure-common/closure-common.asd
===================================================================
--- trunk/thirdparty/closure-common/closure-common.asd	2008-07-14 14:18:51 UTC (rev 3435)
+++ trunk/thirdparty/closure-common/closure-common.asd	2008-07-14 14:33:26 UTC (rev 3436)
@@ -26,7 +26,7 @@
        #+rune-is-character
        (error "conflicting unicode configuration.  Please recompile.")
        (pushnew :rune-is-integer *features*))
-      ((code-char 70000)
+      ((ignore-errors (code-char 70000))
        (when (test #xD800)
 	 (format t " WARNING: Lisp implementation doesn't use UTF-16, ~
                      but accepts surrogate code points.~%"))

Modified: trunk/thirdparty/slime/swank-cmucl.lisp
===================================================================
--- trunk/thirdparty/slime/swank-cmucl.lisp	2008-07-14 14:18:51 UTC (rev 3435)
+++ trunk/thirdparty/slime/swank-cmucl.lisp	2008-07-14 14:33:26 UTC (rev 3436)
@@ -74,7 +74,7 @@
 ;;; `:SPAWN' are reasonable alternatives.
 
 (defimplementation preferred-communication-style ()
-  :sigio)
+  :fd-handler)
 
 #-(or darwin mips)
 (defimplementation create-socket (host port)