From: unknown <Administrator@.(none)>
Date: Tue, 18 Nov 2008 00:41:53 +0000 (-0600)
Subject: Fix some types for Win64
X-Git-Tag: 0.94~2304^2~60
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=eea93234d05abd58a8512d05985541f436ff4652

Fix some types for Win64
---

diff --git a/basis/windows/kernel32/kernel32.factor b/basis/windows/kernel32/kernel32.factor
index 462377e85c..96301dbbe4 100644
--- 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 0ac8409016..6b1a57a098 100644
--- 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