diff --git a/backend/mcl.lisp b/backend/mcl.lisp index 62e52ef..fc91d0d 100644 --- a/backend/mcl.lisp +++ b/backend/mcl.lisp @@ -3,6 +3,9 @@ (in-package :usocket) +(eval-when (:compile-toplevel :load-toplevel :execute) + (require :opentransport)) + (defun handle-condition (condition &optional socket) ; incomplete, needs to handle additional conditions (flet ((raise-error (&optional socket-condition) @@ -93,8 +96,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; BASIC MCL SOCKET IMPLEMENTATION -(require :opentransport) - (defclass socket () ((local-port :reader local-port :initarg :local-port) (local-host :reader local-host :initarg :local-host) diff --git a/usocket.asd b/usocket.asd index b011722..f51e08f 100644 --- a/usocket.asd +++ b/usocket.asd @@ -24,22 +24,14 @@ :depends-on ("package")) (:file "condition" :depends-on ("usocket")) - #+clisp (:file "clisp" :pathname "backend/clisp" - :depends-on ("condition")) - #+cmu (:file "cmucl" :pathname "backend/cmucl" - :depends-on ("condition")) - #+scl (:file "scl" :pathname "backend/scl" - :depends-on ("condition")) - #+(or sbcl ecl) (:file "sbcl" :pathname "backend/sbcl" - :depends-on ("condition")) - #+lispworks (:file "lispworks" :pathname "backend/lispworks" - :depends-on ("condition")) - #+openmcl (:file "openmcl" :pathname "backend/openmcl" - :depends-on ("condition")) - #+allegro (:file "allegro" :pathname "backend/allegro" - :depends-on ("condition")) - #+armedbear (:file "armedbear" :pathname "backend/armedbear" - :depends-on ("condition")) - #+mcl (:file "mcl" :pathname "backend/armedbear" - :depends-on ("condition")) - )) + (:module "backend" + :depends-on ("condition") + :components (#+clisp (:file "clisp") + #+cmu (:file "cmucl") + #+scl (:file "scl") + #+(or sbcl ecl) (:file "sbcl") + #+lispworks (:file "lispworks") + #+mcl (:file "mcl") + #+openmcl (:file "openmcl") + #+allegro (:file "allegro") + #+armedbear (:file "armedbear")))))