r10393: fix sbcl compilation

diff --git a/debian/changelog b/debian/changelog
index bb59e8f3747dcc979e7e98bc3cdfdc5087ee85af..ecd11071d27164fb3de80d0fc1c4978e1ca6b251 100644 (file)
--- 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 5d0bcf75bfd07b0f7896efdc1d11091d7e0ce261..f02f2033e29dfbd460927cca138eb844d7877302 100644 (file)
--- 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 a0ca3fc31bdb26ad3e9d099c5caed63c552e0bf1..2e7ff960d794dfd6231e1bba718460b59851528d 100644 (file)
--- 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 7acf7c0a135738b8426d31335cac4c7644dcce5a..a2ed7954b86c15347d033582b618fc157023a6ba 100644 (file)
--- 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"))))