Author: ctian Date: Thu Jan 7 18:49:04 2010 New Revision: 517

Log: merge from trunk (r509)

Modified: usocket/branches/0.4.x/backend/openmcl.lisp

Modified: usocket/branches/0.4.x/backend/openmcl.lisp ============================================================================== --- usocket/branches/0.4.x/backend/openmcl.lisp (original) +++ usocket/branches/0.4.x/backend/openmcl.lisp Thu Jan 7 18:49:04 2010 @@ -85,8 +85,7 @@ :format (to-format element-type) :deadline deadline :nodelay nodelay - :connect-timeout (and timeout - (* timeout internal-time-units-per-second))))) + :connect-timeout timeout))) (openmcl-socket:socket-connect mcl-sock) (make-stream-socket :stream mcl-sock :socket mcl-sock))))