Fix some types for Win64

diff --git a/basis/windows/kernel32/kernel32.factor b/basis/windows/kernel32/kernel32.factor
index 462377e85c326e18606703792b2126c38e6df32f..96301dbbe4b96c88dbec2e6680491dcb44853fbe 100644 (file)
--- a/basis/windows/kernel32/kernel32.factor
+++ b/basis/windows/kernel32/kernel32.factor
@@ -199,11 +199,11 @@ TYPEDEF: FILE_NOTIFY_INFORMATION* PFILE_NOTIFY_INFORMATION
 : THREAD_PRIORITY_TIME_CRITICAL 15 ; inline
 
 C-STRUCT: OVERLAPPED
-    { "int" "internal" }
-    { "int" "internal-high" }
-    { "int" "offset" }
-    { "int" "offset-high" }
-    { "void*" "event" } ;
+    { "UINT_PTR" "internal" }
+    { "UINT_PTR" "internal-high" }
+    { "DWORD" "offset" }
+    { "DWORD" "offset-high" }
+    { "HANDLE" "event" } ;
 
 C-STRUCT: SYSTEMTIME
     { "WORD" "wYear" }

diff --git a/basis/windows/types/types.factor b/basis/windows/types/types.factor
index 0ac84090162d87cba6d9f9cf49541d7e5fe74f38..6b1a57a098af32a6fcb79071d4cb73831c5e3213 100644 (file)
--- a/basis/windows/types/types.factor
+++ b/basis/windows/types/types.factor
@@ -40,10 +40,11 @@ TYPEDEF: void*               LPVOID
 TYPEDEF: void*               LPCVOID
 
 TYPEDEF: float               FLOAT
-TYPEDEF: short       HALF_PTR
-TYPEDEF: ushort      UHALF_PTR
-TYPEDEF: int         INT_PTR
-TYPEDEF: uint        UINT_PTR
+
+TYPEDEF: intptr_t    HALF_PTR
+TYPEDEF: intptr_t    UHALF_PTR
+TYPEDEF: intptr_t    INT_PTR
+TYPEDEF: intptr_t    UINT_PTR
 
 TYPEDEF: int         LONG_PTR
 TYPEDEF: ulong       ULONG_PTR