Skip to content
Snippets Groups Projects
Commit c6c7366b authored by rtoy's avatar rtoy
Browse files

* code/internet.lisp, code/unix.lisp:

  o Make inet-recvfrom and friends available on Darwin again.

* lisp/linux-stubs.S
  o Oops. Forgot to fix up #if with !defined(DARWIN)
  o Add recvfrom and friends to the stubs.
parent 8a981c6e
No related branches found
No related tags found
No related merge requests found
......@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/internet.lisp,v 1.45 2005/02/06 19:26:13 rtoy Exp $")
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/internet.lisp,v 1.46 2005/02/07 00:47:44 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
......@@ -688,8 +688,6 @@ struct in_addr {
fd
(unix:get-unix-error-msg)))))
#-darwin
(progn
(defun inet-recvfrom (fd buffer size &key (flags 0))
"A packaging of the unix recvfrom call. Returns three values:
bytecount, source address as integer, and source port. bytecount
......@@ -724,4 +722,4 @@ can of course be negative, to indicate faults."
:format-control "Error on shutdown of socket: ~A"
:format-arguments (list (unix:get-unix-error-msg))
:errno (unix:unix-errno))))
)
......@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain.
;;;
(ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/unix.lisp,v 1.101 2005/02/06 19:26:13 rtoy Exp $")
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/unix.lisp,v 1.102 2005/02/07 00:47:44 rtoy Exp $")
;;;
;;; **********************************************************************
;;;
......@@ -2969,8 +2969,6 @@
;; Datagram support
#-darwin
(progn
(def-alien-routine ("recvfrom" unix-recvfrom) int
(fd int)
(buffer c-string)
......@@ -2990,7 +2988,6 @@
(def-alien-routine ("shutdown" unix-shutdown) int
(socket int)
(level int))
)
;;;
......
/* linux-stubs.S
$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/linux-stubs.S,v 1.18 2004/09/21 11:59:17 emarsden Exp $
$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/linux-stubs.S,v 1.19 2005/02/07 00:47:45 rtoy Exp $
These are needed because the locations of the
libraries are filled in by ld.so at runtime.
......@@ -43,7 +43,7 @@ PVE_stub_ ## fct: ;\
#endif
#if defined(LINKAGE_TABLE) && !defined(__FreeBSD__)
#if defined(LINKAGE_TABLE) && !defined(__FreeBSD__) && !defined(DARWIN)
/* This is a workaround for glibc braindamage. These symbols are
magically transformed by the preprocessor and linker so that
these symbols of don't appear in libc.so. These stubs
......@@ -705,7 +705,7 @@ PVE_stub_ ## fct: ;\
/* doe(realpath) */
/* doe(reboot) */
/* doe(recv) */
/* doe(recvfrom) */
doe(recvfrom)
/* doe(recvmsg) */
/* doe(regcomp) */
/* doe(regerror) */
......@@ -751,7 +751,7 @@ PVE_stub_ ## fct: ;\
/* doe(semop) */
/* doe(send) */
/* doe(sendmsg) */
/* doe(sendto) */
doe(sendto)
/* doe(set_new_handler) */
/* doe(setbuf) */
/* doe(setbuffer) */
......@@ -798,7 +798,7 @@ PVE_stub_ ## fct: ;\
/* doe(shmctl) */
/* doe(shmdt) */
/* doe(shmget) */
/* doe(shutdown) */
doe(shutdown)
/* doe(sigaction) */
/* doe(sigaddset) */
/* doe(sigblock) */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment