From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Wed, 6 Apr 2005 17:42:24 +0000 (+0000)
Subject: r10393: fix sbcl compilation
X-Git-Tag: v1.6.1~64
X-Git-Url: http://git.kpe.io/?p=uffi.git;a=commitdiff_plain;h=5d4295830e68c889ba2df9d9f88e896a70f20d7a

r10393: fix sbcl compilation
---

diff --git a/debian/changelog b/debian/changelog
index bb59e8f..ecd1107 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-uffi (1.4.36-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Wed,  6 Apr 2005 11:42:09 -0600
+
 cl-uffi (1.4.35-1) unstable; urgency=low
 
   * New upstream
diff --git a/src/aggregates.lisp b/src/aggregates.lisp
index 5d0bcf7..f02f203 100644
--- a/src/aggregates.lisp
+++ b/src/aggregates.lisp
@@ -227,17 +227,18 @@ of the enum-name name, separator-string, and field-name"
       (setf (aref a i) (uffi:deref-array s '(:array :unsigned-byte) i)))))
 
 #+sbcl
-(sb-ext:without-package-locks
- (defvar *system-copy-fn* (if (fboundp (intern "COPY-FROM-SYSTEM-AREA" "SB-KERNEL"))
-			      (intern "COPY-FROM-SYSTEM-AREA" "SB-KERNEL")
-			    (intern "COPY-UB8-FROM-SYSTEM-AREA" "SB-KERNEL")))
- (defconstant *system-copy-offset* (if (fboundp (intern "COPY-FROM-SYSTEM-AREA" "SB-KERNEL"))
-				       (* sb-vm:vector-data-offset sb-vm:n-word-bits)
-				     0))
- (defconstant *system-copy-multiplier* (if (fboundp (intern "COPY-FROM-SYSTEM-AREA" "SB-KERNEL"))
-					   sb-vm:n-byte-bits
-					 1)))
-
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (sb-ext:without-package-locks
+      (defvar *system-copy-fn* (if (fboundp (intern "COPY-FROM-SYSTEM-AREA" "SB-KERNEL"))
+				   (intern "COPY-FROM-SYSTEM-AREA" "SB-KERNEL")
+				   (intern "COPY-UB8-FROM-SYSTEM-AREA" "SB-KERNEL")))
+    (defconstant +system-copy-offset+ (if (fboundp (intern "COPY-FROM-SYSTEM-AREA" "SB-KERNEL"))
+					  (* sb-vm:vector-data-offset sb-vm:n-word-bits)
+					  0))
+    (defconstant +system-copy-multiplier+ (if (fboundp (intern "COPY-FROM-SYSTEM-AREA" "SB-KERNEL"))
+					      sb-vm:n-byte-bits
+					      1))))
+  
 
 #+sbcl
 (defun convert-from-foreign-usb8 (s len)
@@ -246,8 +247,8 @@ of the enum-name name, separator-string, and field-name"
     (locally
      (declare (optimize (speed 3) (safety 0)))
      (let ((result (make-array len :element-type '(unsigned-byte 8))))
-       (funcall *system-copy-fn* sap 0 result *system-copy-offset*
-		(* len *system-copy-multiplier*))
+       (funcall *system-copy-fn* sap 0 result +system-copy-offset+
+		(* len +system-copy-multiplier+))
        result))))
 
 #+cmu
diff --git a/src/strings.lisp b/src/strings.lisp
index a0ca3fc..2e7ff96 100644
--- a/src/strings.lisp
+++ b/src/strings.lisp
@@ -317,8 +317,8 @@ that LW/CMU automatically converts strings from c-calls."
 	     (setq length null-terminated-length))
        (setq length null-terminated-length)))
    (let ((result (make-string length)))
-       (funcall *system-copy-fn* sap 0 result *system-copy-offset*
-		(* length *system-copy-multiplier*))
+       (funcall *system-copy-fn* sap 0 result +system-copy-offset+
+		(* length +system-copy-multiplier+))
        result)))
 
 #+(and sbcl sb-unicode)
diff --git a/uffi.asd b/uffi.asd
index 7acf7c0..a2ed795 100644
--- a/uffi.asd
+++ b/uffi.asd
@@ -36,8 +36,8 @@
 	     (:file "primitives" :depends-on ("package"))
 	     #+mcl (:file "readmacros-mcl" :depends-on ("package"))
 	     (:file "objects" :depends-on ("primitives"))
-	     (:file "strings" :depends-on ("primitives" "functions" "aggregates" "objects"))
 	     (:file "aggregates" :depends-on ("primitives"))
+	     (:file "strings" :depends-on ("primitives" "functions" "aggregates" "objects"))
 	     (:file "functions" :depends-on ("primitives"))
 	     (:file "libraries" :depends-on ("package"))
 	     (:file "os" :depends-on ("package"))))