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

2008-04-28 16:49:29 -05:00 · 2008-04-28 16:49:29 -05:00 · 9ceedc4fbc
parent 618e10a6b2 0a99342f2b
commit 9ceedc4fbc
2 changed files with 228 additions and 227 deletions
--- a/extra/windows/com/syntax/syntax.factor
+++ b/extra/windows/com/syntax/syntax.factor
@ -57,7 +57,7 @@ unless

 : family-tree ( definition -- definitions )
    dup parent>> [ family-tree ] [ { } ] if*
-    swap add ;
+    swap suffix ;

 : family-tree-functions ( definition -- functions )
    dup parent>> [ family-tree-functions ] [ { } ] if*
--- a/extra/windows/ole32/ole32.factor
+++ b/extra/windows/ole32/ole32.factor
@ -1,5 +1,6 @@
 USING: alien alien.syntax alien.c-types alien.strings math
-kernel sequences windows windows.types combinators.lib ;
+kernel sequences windows windows.types combinators.lib
+math.order ;
 IN: windows.ole32

 LIBRARY: ole32