Author: ctian Date: Wed Nov 12 13:39:02 2008 New Revision: 474 Log: [udp-branch] update SOCKET-CONNECT on LW, TIMEOUT is supported. Modified: usocket/branches/experimental-udp/backend/lispworks.lisp Modified: usocket/branches/experimental-udp/backend/lispworks.lisp ============================================================================== --- usocket/branches/experimental-udp/backend/lispworks.lisp (original) +++ usocket/branches/experimental-udp/backend/lispworks.lisp Wed Nov 12 13:39:02 2008 @@ -250,11 +250,19 @@ timeout deadline (nodelay t nodelay-specified) local-host local-port) (declare (ignorable nodelay)) - (when timeout (unimplemented 'timeout 'socket-connect)) - (when deadline (unsupported 'deadline 'socket-connect :minimum "LispWorks 5.1")) - - #+(and (not lispworks4) (not lispworks5.0)) - (when nodelay-specified (unimplemented 'nodelay 'socket-connect)) + + ;; What's the meaning of this keyword? + (when deadline + (unimplemented 'deadline 'socket-connect)) + + #+(or lispworks4.2 lispworks4.3) ; < 4.4.5 + (when timeout + (unsupported 'timeout 'socket-connect :minimum "LispWorks 4.4.5")) + + #+(or lispworks4 lispworks5.0) ; < 5.1 + (when nodelay-specified + (unsupported 'nodelay 'socket-connect :minimum "LispWorks 5.1")) + #+lispworks4 #+lispworks4 (when local-host (unsupported 'local-host 'socket-connect :minimum "LispWorks 5.0")) @@ -269,12 +277,15 @@ (with-mapped-conditions () (comm:open-tcp-stream hostname port :element-type element-type + #-(or lispworks4.2 lispworks4.3) ; >= 4.4.5 + #-(or lispworks4.2 lispworks4.3) + :timeout timeout #-lispworks4 #-lispworks4 #-lispworks4 #-lispworks4 :local-address (when local-host (host-to-hostname local-host)) :local-port local-port - #+(and (not lispworks4) (not lispworks5.0)) - #+(and (not lispworks4) (not lispworks5.0)) + #-(or lispworks4 lispworks5.0) ; >= 5.1 + #-(or lispworks4 lispworks5.0) :nodelay nodelay))) (if stream (make-stream-socket :socket (comm:socket-stream-socket stream)