Author: ehuelsmann Date: Thu Jun 26 17:30:49 2008 New Revision: 354

Modified: usocket/branches/0.3.x/backend/openmcl.lisp Log: Fix OpenMCL (CCL) backend, directly on the branch, because this code doesn't exist on trunk any longer.

Patch by: Chun Tian (binghe) (binghe.lisp@gmail.com)

Modified: usocket/branches/0.3.x/backend/openmcl.lisp ============================================================================== --- usocket/branches/0.3.x/backend/openmcl.lisp (original) +++ usocket/branches/0.3.x/backend/openmcl.lisp Thu Jun 26 17:30:49 2008 @@ -37,15 +37,15 @@ (ccl::fd-zero infds) (ccl::fd-zero errfds) (dolist (sock sockets) - (ccl::fd-set (socket-os-fd sock infds)) - (ccl::fd-set (socket-os-fd sock errfds))) + (ccl::fd-set (openmcl-socket:socket-os-fd sock infds)) + (ccl::fd-set (openmcl-socket:socket-os-fd sock errfds))) (let* ((res (#_select - (1+ (apply #'max fds)) + (1+ (apply #'max infds)) infds (ccl::%null-ptr) errfds (if ticks-to-wait tv (ccl::%null-ptr))))) (when (> res 0) (remove-if #'(lambda (x) - (not (ccl::fd-is-set (socket-os-fd x) infds))) + (not (ccl::fd-is-set (openmcl-socket:socket-os-fd x) infds))) sockets))))))

(defun wait-for-input (sockets &optional ticks-to-wait) @@ -67,7 +67,7 @@ (raise-error-from-id (openmcl-socket:socket-error-identifier condition) socket condition)) (ccl::socket-creation-error #| ugh! |# - (raise-error-from-id (ccl::socket-creationg-error-identifier condition) + (raise-error-from-id (ccl::socket-creation-error-identifier condition) socket condition)) (error (error 'unknown-error :socket socket :real-error condition)) (condition (signal 'unknown-condition :real-condition condition))))