Fix <long>, <ulong>, *long, *ulong on win64

diff --git a/basis/alien/c-types/c-types-tests.factor b/basis/alien/c-types/c-types-tests.factor
index edda9e7fdb4fa13a7a16c1336f6ce9bbf36edd09..5c4f022e9390fce4eaf2855abd2dce6269244f1a 100644 (file)
--- a/basis/alien/c-types/c-types-tests.factor
+++ b/basis/alien/c-types/c-types-tests.factor
@@ -56,3 +56,7 @@ TYPEDEF: uchar* MyLPBYTE
 ] must-fail
 
 [ t ] [ { t f t } >c-bool-array { 1 0 1 } >c-int-array = ] unit-test
+
+os windows? cpu x86.64? and [
+    [ -2147467259 ] [ 2147500037 <long> *long  ] unit-test
+] when

diff --git a/basis/cpu/x86/64/winnt/winnt.factor b/basis/cpu/x86/64/winnt/winnt.factor
index 9108c0e8f77b16a7d3fb55f40fba171bfd212861..629ba23e06aeb00afdd63c37b2466858cd031714 100644 (file)
--- a/basis/cpu/x86/64/winnt/winnt.factor
+++ b/basis/cpu/x86/64/winnt/winnt.factor
@@ -23,6 +23,6 @@ M: x86.64 dummy-fp-params? t ;
 <<
 "longlong" "ptrdiff_t" typedef
 "longlong" "intptr_t" typedef
-"int" "long" typedef
-"uint" "ulong" typedef
+"int" c-type "long" define-primitive-type
+"uint" c-type "ulong" define-primitive-type
 >>