X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-bsd-sockets%2Fsockets.lisp;h=9f15ad636a932da1e8b86a8271c31eb59a5e6e89;hb=32c8edbd49ca77907154987e28e8d3f81f61dabc;hp=c182cee5c4d8a253c75aca7d081440be1e1f40c3;hpb=f3f1143a09fa2e50eec13614cc6b0306b2b11fad;p=sbcl.git

diff --git a/contrib/sb-bsd-sockets/sockets.lisp b/contrib/sb-bsd-sockets/sockets.lisp
index c182cee..9f15ad6 100644
--- a/contrib/sb-bsd-sockets/sockets.lisp
+++ b/contrib/sb-bsd-sockets/sockets.lisp
@@ -64,7 +64,7 @@ See also bind(2)"))
   (let ((sockaddr (apply #'make-sockaddr-for socket nil address)))
     (if (= (sb-sys:with-pinned-objects (sockaddr)
 	    (sockint::bind (socket-file-descriptor socket)
-			   (sockint::array-data-address sockaddr)
+			   (sb-grovel::array-data-address sockaddr)
 			   (size-of-sockaddr socket)))
            -1)
         (socket-error "bind"))))
@@ -79,7 +79,7 @@ values"))
   (let ((sockaddr (make-sockaddr-for socket)))
     (sb-sys:with-pinned-objects (sockaddr)
       (let ((fd (sockint::accept (socket-file-descriptor socket)
-				 (sockint::array-data-address sockaddr)
+				 (sb-grovel::array-data-address sockaddr)
 				 (size-of-sockaddr socket))))
 	(apply #'values
 	       (if (= fd -1)
@@ -99,7 +99,7 @@ values"))
   (let* ((sockaddr (apply #'make-sockaddr-for socket nil peer)))
     (if (= (sb-sys:with-pinned-objects (sockaddr)
 	    (sockint::connect (socket-file-descriptor socket)
-			      (sockint::array-data-address sockaddr)
+			      (sb-grovel::array-data-address sockaddr)
 			      (size-of-sockaddr socket)))
 	   -1)
 	(socket-error "connect") )))
@@ -112,7 +112,7 @@ values"))
   (let* ((sockaddr (make-sockaddr-for socket)))
     (when (= (sb-sys:with-pinned-objects (sockaddr)
 	      (sockint::getpeername (socket-file-descriptor socket)
-				    (sockint::array-data-address sockaddr)
+				    (sb-grovel::array-data-address sockaddr)
 				    (size-of-sockaddr socket)))
 	     -1)
       (socket-error "getpeername"))
@@ -126,7 +126,7 @@ values"))
   (let* ((sockaddr (make-sockaddr-for socket)))
     (when (= (sb-sys:with-pinned-objects (sockaddr)
 	      (sockint::getsockname (socket-file-descriptor socket)
-				    (sockint::array-data-address sockaddr)
+				    (sb-grovel::array-data-address sockaddr)
 				    (size-of-sockaddr socket)))
 	     -1)
       (socket-error "getsockname"))
@@ -172,10 +172,10 @@ small"))
       (sb-sys:with-pinned-objects (buffer sockaddr) 
        (let ((len
 	      (sockint::recvfrom (socket-file-descriptor socket)
-				 (sockint::array-data-address buffer)
+				 (sb-grovel::array-data-address buffer)
 				 (or length (length buffer))
 				 flags
-				 (sockint::array-data-address sockaddr)
+				 (sb-grovel::array-data-address sockaddr)
 				 (sb-alien:cast sa-len (* integer)))))
 	 (when (= len -1) (socket-error "recvfrom"))
 	 (apply #'values buffer len (multiple-value-list