Merge branch 'master' into new-alien-pointers

Conflicts:
	basis/alien/c-types/c-types.factor
	basis/stack-checker/dependencies/dependencies.factor

diff --cc basis/alien/c-types/c-types.factor
index 9db6ac7f4a18a9a58b9fe6ceeba7be7f8d130ac0,fff49a44808831871d4c28bddaae6da67f17cc32..a9392b03d7489829d838eaf38c719283de7cf5bb
--- 1/basis/alien/c-types/c-types.factor
--- 2/basis/alien/c-types/c-types.factor
+++ b/basis/alien/c-types/c-types.factor
@@@ -48,17 -49,21 +49,14 @@@ ERROR: no-c-type name 
  ! C type protocol
  GENERIC: c-type ( name -- c-type ) foldable
  
- : void? ( c-type -- ? )
-     void = ; inline
 -GENERIC: resolve-pointer-type ( name -- c-type )
--
 -<< \ void \ void* "pointer-c-type" set-word-prop >>
 +PREDICATE: c-type-word < word
 +    "c-type" word-prop ;
  
 -M: word resolve-pointer-type
 -    dup "pointer-c-type" word-prop
 -    [ ] [ drop void* ] ?if ;
 +TUPLE: pointer { to initial: void read-only } ;
 +C: <pointer> pointer
  
 -M: array resolve-pointer-type
 -    first resolve-pointer-type ;
 +UNION: c-type-name
 +    c-type-word pointer ;
  
  : resolve-typedef ( name -- c-type )
      dup void? [ no-c-type ] when

diff --cc basis/alien/parser/parser.factor
Simple merge

diff --cc basis/stack-checker/dependencies/dependencies.factor
Simple merge