[Portableaserve-cvslog] CVS: portableaserve/acl-compat acl-excl-common.lisp,1.7,1.8 acl-compat.asd,1.53,1.54

[Rudi S. <ru...@us...>]

Update of /cvsroot/portableaserve/portableaserve/acl-compat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10641/acl-compat

Modified Files:
	acl-excl-common.lisp acl-compat.asd 
Log Message:
Merge "Problems with non-Debian CMUCL and acl-compat" (Stefan Scholl,
paserve-discuss 2006-04-04)
  ... untested, since I don't have a running cmucl anywhere


Index: acl-excl-common.lisp
===================================================================
RCS file: /cvsroot/portableaserve/portableaserve/acl-compat/acl-excl-common.lisp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- acl-excl-common.lisp	18 Feb 2005 20:24:30 -0000	1.7
+++ acl-excl-common.lisp	8 Apr 2006 14:06:17 -0000	1.8
@@ -185,6 +185,7 @@
   `(locally (declare (optimize (speed 3) (safety 0) (debug 0)))
 	    ,@forms))
 
+#-cmu
 (defun write-vector (sequence stream &key (start 0) end endian-swap)
   (declare (ignore endian-swap))
   (check-type sequence (or string (array (unsigned-byte 8) 1)

Index: acl-compat.asd
===================================================================
RCS file: /cvsroot/portableaserve/portableaserve/acl-compat/acl-compat.asd,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -w -r1.53 -r1.54
--- acl-compat.asd	5 Aug 2004 04:46:47 -0000	1.53
+++ acl-compat.asd	8 Apr 2006 14:06:18 -0000	1.54
@@ -26,6 +26,7 @@
 (defmethod operation-done-p ((operation load-op) (c precompiled-file))
   nil)
 
+#-gray-streams
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (unless (asdf:find-system :cmucl-graystream nil)
     (asdf:defsystem cmucl-graystream
@@ -174,7 +175,7 @@
                  :cl-ppcre
                  #+sbcl :sb-bsd-sockets
                  #+sbcl :sb-posix
-                 #+cmu :cmucl-graystream
+                 #+(and cmu (not gray-streams)) :cmucl-graystream
                  #+(and (or cmu lispworks) ssl-available) :cl-ssl
                  )
     :perform (load-op :after (op acl-compat)