Common subdirectories: /Users/blah/Desktop/elephant/src/CVS and ../src/CVS
diff -U 5 /Users/blah/Desktop/elephant/src/bdb-enable.lisp ../src/bdb-enable.lisp
--- /Users/blah/Desktop/elephant/src/bdb-enable.lisp	2006-02-06 01:30:54.000000000 +0100
+++ ../src/bdb-enable.lisp	2006-02-14 13:40:19.000000000 +0100
@@ -63,11 +63,11 @@
        ;; Sleepycat: this works on linux
        #+linux
 ;;       "/db/ben/lisp/db43/lib/libdb.so" 
        "/usr/local/BerkeleyDB.4.3/lib/libdb-4.3.so"
        ;; this works on FreeBSD
-       #+(and (or bsd freebsd) (not darwin macosx))
+       #+(and (or bsd freebsd) (not darwin) (not macosx))
        "/usr/local/lib/db43/libdb.so" 
        #+(or darwin macosx)
        ;; for Fink (OS X) -- but I will assume Linux more common...
 ;;       "/sw/lib/libdb-4.3.dylib"
        ;; a possible manual install
diff -U 5 /Users/blah/Desktop/elephant/src/serializer.lisp ../src/serializer.lisp
--- /Users/blah/Desktop/elephant/src/serializer.lisp	2006-02-06 01:30:54.000000000 +0100
+++ ../src/serializer.lisp	2006-02-14 13:46:00.000000000 +0100
@@ -464,11 +464,11 @@
 
 
 (eval-when (:compile-toplevel :load-toplevel)
   (asdf:operate 'asdf:load-op :cl-base64)
 )
-(defun ser-deser-equal (x1 &keys sc)
+(defun ser-deser-equal (x1 &key sc)
   (let* (
 	 (x1s (serialize-to-base64-string x1))
 	 (x1prime (deserialize-from-base64-string x1s :sc sc)))
     (assert (equal x1 x1prime))
     (equal x1 x1prime)))
@@ -480,11 +480,11 @@
    (sleepycat::buffer-read-byte-vector 
     (serialize x out-buf))))
   )
 
 
-(defun deserialize-from-base64-string (x &keys sc)
+(defun deserialize-from-base64-string (x &key sc)
   (with-buffer-streams (other)
     (deserialize 
      (sleepycat::buffer-write-byte-vector 
       other 
       (cl-base64::base64-string-to-usb8-array x))
