net.lisp, sys.lisp: Merge packages.

[zone] / sys.lisp

diff --git a/sys.lisp b/sys.lisp
index fc7180e24aacfeb045b0a93a09431052255ca6ea..9f900f77d71e4fdf7fa60af904f9b9f9fd8ea2a9 100644 (file)
--- a/sys.lisp
+++ b/sys.lisp
@@ -21,10 +21,7 @@
 ;;; along with this program; if not, write to the Free Software Foundation,
 ;;; Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-(cl:defpackage #:net-sys
-  (:use #:common-lisp)
-  (:export #:gethostname #:resolve-hostname #:canonify-hostname))
-(cl:in-package #:net-sys)
+(cl:in-package #:net)
 
 ;;;--------------------------------------------------------------------------
 ;;; Functions provided.
@@ -34,6 +31,7 @@ (cffi:defcfun gethostname :int
   (name :pointer)
   (len :uint))
 
+(export 'gethostname)
 (defun gethostname ()
   "Return the hostname (not necessarily canonical) of the current host."
 
@@ -55,6 +53,7 @@ (defun gethostname ()
   #-(or cmu sbcl clisp ecl)
   "<unknown-host>")
 
+(export 'resolve-hostname)
 (defun resolve-hostname (name)
   "Resolve a hostname to an IP address using the DNS, or return nil."
 
@@ -79,6 +78,7 @@ (defun resolve-hostname (name)
   #-(or cmu sbcl clisp ecl)
   nil)
 
+(export 'canonify-hostname)
 (defun canonify-hostname (name)
   "Resolve a hostname to canonical form using the DNS, or return nil."