From: Joe Groff <arcata@gmail.com>
Date: Tue, 23 Feb 2010 16:10:12 +0000 (-0800)
Subject: Merge branch 'master' of git://factorcode.org/git/factor
X-Git-Tag: 0.97~4835
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=482aed8eccad56c4c20c61ccade197330550666a;hp=282f284515c90cadf4b1e262087ee8469f80b348

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

diff --git a/basis/alien/c-types/c-types-tests.factor b/basis/alien/c-types/c-types-tests.factor
index ad53dc487b..10a7b50ebb 100644
--- a/basis/alien/c-types/c-types-tests.factor
+++ b/basis/alien/c-types/c-types-tests.factor
@@ -44,6 +44,14 @@ TYPEDEF: char MyFunkyChar
 [ f ] [ pointer: char c-type pointer: MyFunkyChar c-type = ] unit-test
 [ { char* ascii } ] [ pointer: MyFunkyChar c-type ] unit-test
 
+TYPEDEF: MyFunkyChar MyFunkyTypedef
+
+[ { char* ascii } ] [ pointer: MyFunkyTypedef c-type ] unit-test
+
+TYPEDEF: MyFunkyChar* MyFunkyString
+
+[ { char* ascii } ] [ MyFunkyString c-type ] unit-test
+
 TYPEDEF: char* MyString
 
 [ t ] [ char* c-type MyString          c-type = ] unit-test
diff --git a/basis/alien/c-types/c-types.factor b/basis/alien/c-types/c-types.factor
index 316377dc27..3255d16d80 100644
--- a/basis/alien/c-types/c-types.factor
+++ b/basis/alien/c-types/c-types.factor
@@ -301,7 +301,7 @@ CONSTANT: primitive-types
 : special-pointer-type ( type -- special-type )
     dup c-type-word? [
         dup "pointer-c-type" word-prop
-        [ ] [ resolve-pointer-typedef "pointer-c-type" word-prop ] ?if
+        [ ] [ "c-type" word-prop special-pointer-type ] ?if
     ] [ drop f ] if ;
 
 : primitive-pointer-type? ( type -- ? )
diff --git a/basis/windows/types/types.factor b/basis/windows/types/types.factor
index 4f527513fc..d0dac31ea9 100644
--- a/basis/windows/types/types.factor
+++ b/basis/windows/types/types.factor
@@ -11,7 +11,7 @@ TYPEDEF: uchar               UCHAR
 TYPEDEF: uchar               BYTE
 
 TYPEDEF: ushort              wchar_t
-TYPEDEF: { char* utf16n }    wchar_t*
+<< { char* utf16n } pointer: wchar_t typedef >>
 
 TYPEDEF: wchar_t             WCHAR