Author: ctian
Date: Sat Apr 4 09:50:53 2009
New Revision: 495
Log:
[ecl] merge r493 from trunk to make sure building works on ECL 9.4.0
Modified:
usocket/branches/experimental-udp/backend/lispworks.lisp
usocket/branches/experimental-udp/backend/sbcl.lisp
Modified: usocket/branches/experimental-udp/backend/lispworks.lisp
==============================================================================
--- usocket/branches/experimental-udp/backend/lispworks.lisp (original)
+++ usocket/branches/experimental-udp/backend/lispworks.lisp Sat Apr 4 09:50:53 2009
@@ -248,7 +248,7 @@
(defun socket-connect (host port &key (protocol :stream) (element-type 'base-char)
timeout deadline (nodelay t nodelay-specified)
- local-host local-port)
+ local-host (local-port #+win32 *auto-port* #-win32 nil))
(declare (ignorable nodelay))
;; What's the meaning of this keyword?
Modified: usocket/branches/experimental-udp/backend/sbcl.lisp
==============================================================================
--- usocket/branches/experimental-udp/backend/sbcl.lisp (original)
+++ usocket/branches/experimental-udp/backend/sbcl.lisp Sat Apr 4 09:50:53 2009
@@ -68,7 +68,7 @@
(defun fdset-alloc ()
(ffi:c-inline () () :pointer-void
- "cl_alloc_atomic(sizeof(fd_set))" :one-liner t))
+ "ecl_alloc_atomic(sizeof(fd_set))" :one-liner t))
(defun fdset-zero (fdset)
(ffi:c-inline (fdset) (:pointer-void) :void
@@ -96,7 +96,7 @@
(defun get-host-name ()
(ffi:c-inline
() () :object
- "{ char *buf = cl_alloc_atomic(257);
+ "{ char *buf = ecl_alloc_atomic(257);
if (gethostname(buf,256) == 0)
@(return) = make_simple_base_string(buf);
