Improve ccl getenv patch

[clsql.git] / sql / utils.lisp

diff --git a/sql/utils.lisp b/sql/utils.lisp
index 3162a7d8a242e1fc3da6577fdfc136fdd5c60c27..be1396e021af6636032140a445781297b6ab3d21 100644 (file)
--- a/sql/utils.lisp
+++ b/sql/utils.lisp
@@ -17,6 +17,8 @@
 (in-package #:clsql-sys)
 
 (defmacro defaulting (&rest place-value-plist)
+  "for places and values (as an &rest plist)
+   if place-n is null set it to value-n"
   `(progn
     ,@(loop for (place value . rest) on place-value-plist by #'cddr
             collect `(unless ,place (setf ,place ,value)))))
@@ -373,7 +375,7 @@ list of characters and replacement strings."
   (cdr (assoc (string var) ext:*environment-list* :test #'equalp
               :key #'string))
   #+lispworks (lw:environment-variable (string var))
-  #+mcl (ccl::getenv var)
+  #+ccl (ccl::getenv var)
   #+sbcl (sb-ext:posix-getenv var))
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
@@ -406,7 +408,7 @@ list of characters and replacement strings."
   (setq cl:*features* (delete :clsql-lowercase-reader cl:*features*)))
 
 (defun replace-all (string part replacement &key (test #'char=) stream)
-  "Returns a new string in which all the occurences of the part 
+  "Returns a new string in which all the occurences of the part
 is replaced with replacement. [FROM http://cl-cookbook.sourceforge.net/strings.html#manip]"
   (let ((out (or stream (make-string-output-stream))))
     (loop with part-length = (length part)
@@ -441,7 +443,7 @@ removed. keys are searched with #'MEMBER"
     ;;clearing mechanism. If you are on an implementation that doesn't support
     ;;weak hash tables then you're memory may accumulate.
 
-    #-(or sbcl allegro clisp lispworks)
+    #-(or sbcl allegro clisp lispworks ccl)
     (warn "UNSAFE! use of weak hash on implementation without support. (see clsql/sql/utils.lisp to add)")
 
     (make-hash-table
@@ -449,6 +451,7 @@ removed. keys are searched with #'MEMBER"
       #+clisp     :weak      #+clisp :value
       #+lispworks :weak-kind #+lispworks :value
       #+sbcl :weakness #+sbcl :value
+      #+ccl :weak #+ccl :value
       ,@args)
     ))