Changeset 14684 for release/1.6

Timestamp:

Mar 19, 2011, 10:00:03 PM (10 years ago)

Author:

gb

Message:

Propagate r14525 to 1.6 branch.

File:

• release/1.6/source/lib/db-io.lisp (modified) (2 diffs)

release/1.6/source/lib/db-io.lisp

@@ -1216 +1216 @@
       `(,(logior encoded-type-named-transparent-union-ref alt-align-in-bytes-mask)
         ,@(encode-name name)
-        ,@(encode-ffi-field-list (ffi-union-fields u)))
+        ,@(encode-ffi-field-list (ffi-transparent-union-fields u)))
       `(,(logior encoded-type-anon-transparent-union-ref alt-align-in-bytes-mask)
-        ,@(encode-ffi-field-list (ffi-union-fields u))))))
+        ,@(encode-ffi-field-list (ffi-transparent-union-fields u))))))
 
 (defun encode-ffi-struct (s)
@@ -1367 +1367 @@
       (let* ((u (cadr spec))
              (name (ffi-transparent-union-name u))
-             (alt-align-bytes-mask (ash (or (ffi-union-alt-alignment-bits u)
+             (alt-align-bytes-mask (ash (or (ffi-transparent-union-alt-alignment-bits u)
                                             0)
                                         (- 5 3)))            )