Fix conflicts

[factor.git] / basis / alien / structs / structs.factor

diff --git a/basis/alien/structs/structs.factor b/basis/alien/structs/structs.factor
index d1fdbef4c04620f9f58b475765db5d88c74d3f78..9bbb5ce2aa1ad57d7f5e7d8ea5bc99440d959d9f 100644 (file)
--- a/basis/alien/structs/structs.factor
+++ b/basis/alien/structs/structs.factor
@@ -38,10 +38,10 @@ M: struct-type stack-size
 
 : c-struct? ( type -- ? ) (c-type) struct-type? ;
 
-: (define-struct) ( name vocab size align fields -- )
+: (define-struct) ( name size align fields -- )
     [ [ align ] keep ] dip
     struct-type boa
-    -rot define-c-type ;
+    swap typedef ;
 
 : define-struct-early ( name vocab fields -- fields )
     [ first2 <field-spec> ] with with map ;