[usocket-cvs] r332 - in usocket/branches: 0.3.x/backend 0.4.x/backend

[ehuelsmann at common-lisp.net]

Author: ehuelsmann
Date: Fri Apr 11 17:52:19 2008
New Revision: 332

Modified:
   usocket/branches/0.3.x/backend/openmcl.lisp
   usocket/branches/0.4.x/backend/openmcl.lisp
Log:
Backport r328 to 0.3.x and 0.4.x branches.

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	Fri Apr 11 17:52:19 2008
@@ -39,10 +39,10 @@
       (dolist (sock sockets)
         (ccl::fd-set (socket-os-fd sock infds))
         (ccl::fd-set (socket-os-fd sock errfds)))
-      (let* ((res (ccl::syscall syscalls::select
-                                (1+ (apply #'max fds))
-                                infds (ccl::%null-ptr) errfds
-                                (if ticks-to-wait tv (ccl::%null-ptr)))))
+      (let* ((res (#_select
+                   (1+ (apply #'max fds))
+                   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)))

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	Fri Apr 11 17:52:19 2008
@@ -5,15 +5,6 @@
 
 (in-package :usocket)
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  ;; also present in OpenMCL l1-sockets.lisp
-  #+linuxppc-target
-  (require "LINUX-SYSCALLS")
-  #+darwinppc-target
-  (require "DARWIN-SYSCALLS")
-  #+darwinx86-target
-  (require "DARWINX8664-SYSCALLS"))
-
 (defun get-host-name ()
   (ccl::%stack-block ((resultbuf 256))
     (when (zerop (#_gethostname resultbuf 256))
@@ -48,9 +39,9 @@
           (let ((fd (openmcl-socket:socket-os-fd sock)))
             (setf max-fd (max max-fd fd))
             (ccl::fd-set fd infds)))
-        (let* ((res (ccl::syscall syscalls::select (1+ max-fd)
-                                  infds (ccl::%null-ptr) (ccl::%null-ptr)
-                                  (if ticks-to-wait tv (ccl::%null-ptr)))))
+        (let* ((res (#_select (1+ max-fd)
+                              infds (ccl::%null-ptr) (ccl::%null-ptr)
+                              (if ticks-to-wait tv (ccl::%null-ptr)))))
           (when (> res 0)
             (remove-if #'(lambda (x)
                            (not (ccl::fd-is-set (openmcl-socket:socket-os-fd x)