Fix conflict

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

diff --git a/basis/alien/structs/structs.factor b/basis/alien/structs/structs.factor
index adb25aa977a33fffcbe8cb330a13d5f8e67175e3..a97fcf9964ac80ce49dd970a8f61f4a9afeff9d7 100644 (file)
--- a/basis/alien/structs/structs.factor
+++ b/basis/alien/structs/structs.factor
@@ -36,10 +36,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 -- )
     >r [ align ] keep r>
     struct-type boa
-    -rot define-c-type ;
+    swap typedef ;
 
 : define-struct-early ( name vocab fields -- fields )
     [ first2 <field-spec> ] with with map ;