X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-bsd-sockets%2Fdefpackage.lisp;h=e431cf36086c97b6e22eb741e7566100d3133c42;hb=a7674bbb13b5bc6737b147f844a6840912e639c0;hp=5b4b72fbdffa78b658ee79d328c5b54994c3e102;hpb=2e274c84832d4b9a18adc66b5f15b29e217d012b;p=sbcl.git

diff --git a/contrib/sb-bsd-sockets/defpackage.lisp b/contrib/sb-bsd-sockets/defpackage.lisp
index 5b4b72f..e431cf3 100644
--- a/contrib/sb-bsd-sockets/defpackage.lisp
+++ b/contrib/sb-bsd-sockets/defpackage.lisp
@@ -1,9 +1,14 @@
+#+(and sbcl win32)
+(defpackage "SB-WIN32-SOCKETS-INTERNAL"
+  (:nicknames "WIN32SOCKINT")
+  (:shadow close listen)
+  (:use "COMMON-LISP" "SB-ALIEN" "SB-EXT" "SB-C-CALL"))
+
 (defpackage "SB-BSD-SOCKETS-INTERNAL"
   (:nicknames "SOCKINT")
   (:shadow close listen)
   #+cmu (:shadowing-import-from "CL" with-array-data)
   #+sbcl (:shadowing-import-from "SB-KERNEL" with-array-data)
-
   #+cmu (:use "COMMON-LISP" "ALIEN" "SYSTEM" "EXT" "C-CALL")
   #+sbcl (:use "COMMON-LISP" "SB-ALIEN" #+nil "SB-SYSTEM" "SB-EXT" "SB-C-CALL"))
 
@@ -35,13 +40,14 @@
            socket-bind socket-accept socket-connect
            socket-send socket-receive socket-recv
            socket-name socket-peername socket-listen
-           socket-close socket-file-descriptor socket-make-stream
-           get-protocol-by-name
+           socket-close socket-file-descriptor
+           socket-family socket-protocol socket-open-p
+           socket-type socket-make-stream get-protocol-by-name
 
            get-host-by-name get-host-by-address
            host-ent
            host-ent-addresses host-ent-address
-           host-ent aliases host-ent-name
+           host-ent-aliases host-ent-name
            name-service-error
            ;; not sure if these are really good names or not
            netdb-internal-error
@@ -49,26 +55,23 @@
            host-not-found-error
            try-again-error
            no-recovery-error
-           
-	   ;; all socket options are also exported, by code in
-	   ;; sockopt.lisp
-
-           bad-file-descriptor-error
-           address-in-use-error
-           interrupted-error
-           invalid-argument-error
-           out-of-memory-error
-           operation-not-supported-error
-           operation-not-permitted-error
-           protocol-not-supported-error
-	   socket-type-not-supported-error
-           network-unreachable-error
-           
+
+           unknown-protocol
+
+           ;; all socket options are also exported, by code in
+           ;; sockopt.lisp
+
+           socket-error
+
+           ;; other errno-based socket errors are exported by code in
+           ;; sockets.lisp
+
            make-inet-address
 
            non-blocking-mode
            )
   (:use "COMMON-LISP" "SB-BSD-SOCKETS-INTERNAL")
+  (:import-from "SB-INT" "UNSUPPORTED-OPERATOR" "FEATUREP")
   (:documentation
    "
 
@@ -92,7 +95,7 @@ arguments to fit Lisp style more closely.
 <li> Methods applicable to a particular subclass
 <ol>
 <li> <a href="#internet">INET-SOCKET</a> - Internet Protocol (TCP, UDP, raw) sockets
-<li> Methods on <a href="#LOCAL-SOCKET">LOCAL-SOCKET</a> - Local-domain sockets 
+<li> Methods on <a href="#LOCAL-SOCKET">LOCAL-SOCKET</a> - Local-domain sockets
 </ol>
 <li> <a href="#name-service">Name resolution</a> (DNS, /etc/hosts, &amp;c)
 </ol>
@@ -129,7 +132,7 @@ than "network-endian integers".  See the section on <a href="#internet"
     ((package (eql #.*package*)) symbol kind)
   (declare (ignore kind))
   (format nil "file://~A#~A"
-	  #.(namestring
-	     (merge-pathnames "index.html"
-			      (or *load-pathname* *compile-file-pathname*)))
-	  symbol))
\ No newline at end of file
+          #.(namestring
+             (merge-pathnames "index.html"
+                              (or *load-pathname* *compile-file-pathname*)))
+          symbol))