Changeset 14684 for release/1.6


Ignore:
Timestamp:
Mar 19, 2011, 10:00:03 PM (9 years ago)
Author:
gb
Message:

Propagate r14525 to 1.6 branch.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • release/1.6/source/lib/db-io.lisp

    r14453 r14684  
    12161216      `(,(logior encoded-type-named-transparent-union-ref alt-align-in-bytes-mask)
    12171217        ,@(encode-name name)
    1218         ,@(encode-ffi-field-list (ffi-union-fields u)))
     1218        ,@(encode-ffi-field-list (ffi-transparent-union-fields u)))
    12191219      `(,(logior encoded-type-anon-transparent-union-ref alt-align-in-bytes-mask)
    1220         ,@(encode-ffi-field-list (ffi-union-fields u))))))
     1220        ,@(encode-ffi-field-list (ffi-transparent-union-fields u))))))
    12211221
    12221222(defun encode-ffi-struct (s)
     
    13671367      (let* ((u (cadr spec))
    13681368             (name (ffi-transparent-union-name u))
    1369              (alt-align-bytes-mask (ash (or (ffi-union-alt-alignment-bits u)
     1369             (alt-align-bytes-mask (ash (or (ffi-transparent-union-alt-alignment-bits u)
    13701370                                            0)
    13711371                                        (- 5 3)))            )
Note: See TracChangeset for help on using the changeset viewer.