Merge branch 'master' of git://factorcode.org/git/factor

diff --cc basis/alien/structs/fields/fields.factor
Simple merge

diff --cc basis/alien/structs/structs.factor
index fed3ce801b0f7267326074a30d29375c3edfe293,3cc4857ecbfde9c4e47d6131a66e69441344af94..05558040e8d55023ebb7db494f25a3e6b6e40118
--- 1/basis/alien/structs/structs.factor
--- 2/basis/alien/structs/structs.factor
+++ b/basis/alien/structs/structs.factor
@@@ -55,12 -55,11 +55,11 @@@ M: struct-type stack-siz
      [ struct-offsets ] keep
      [ [ type>> ] map compute-struct-align ] keep
      [ struct-type (define-struct) ] keep
 -    [ define-field ] each ;
 +    [ define-field ] each ; deprecated
  
  : define-union ( name members -- )
-     [ expand-constants ] map
      [ [ heap-size ] [ max ] map-reduce ] keep
 -    compute-struct-align f struct-type (define-struct) ;
 +    compute-struct-align f struct-type (define-struct) ; deprecated
  
  : offset-of ( field struct -- offset )
      c-types get at fields>>