diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-27 11:47:53 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-27 11:47:53 +0000 |
| commit | 1aa54c6db6a10bf671a80eddf93630fbbea4f810 (patch) | |
| tree | 6c2d44ce06689e3dfa7b80f4f0d52fb0825e5ad9 /include/ruby/win32.h | |
| parent | 41e9245e853c6d1f02a60f431afa87aeb7749787 (diff) | |
* include/ruby/win32.h, win32/Makefile.sub, win32/configure.bat,
win32/mkexports.rb, win32/setup.mak, win32/win32.c: import
x64-mswin64 port.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby/win32.h')
| -rw-r--r-- | include/ruby/win32.h | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/include/ruby/win32.h b/include/ruby/win32.h index 450cb32853..4644a4ae71 100644 --- a/include/ruby/win32.h +++ b/include/ruby/win32.h @@ -67,6 +67,26 @@ extern "C++" { #endif #include <io.h> #include <malloc.h> +#ifdef __MINGW32__ +# include <stdint.h> +#else +# if !defined(_INTPTR_T_DEFINED) +# ifdef _WIN64 +typedef __int64 intptr_t; +# else +typedef int intptr_t; +# endif +# define _INTPTR_T_DEFINED +# endif +# if !defined(_UINTPTR_T_DEFINED) +# ifdef _WIN64 +typedef unsigned __int64 uintptr_t; +# else +typedef unsigned int uintptr_t; +# endif +# define _UINTPTR_T_DEFINED +# endif +#endif #if defined(__cplusplus) } @@ -531,8 +551,8 @@ Since this function is very dangerous, ((*NEVER*)) * use anything like TRAP_BEG...TRAP_END block structure, in asynchronous_func_t. */ -typedef DWORD (*asynchronous_func_t)(DWORD self, int argc, DWORD* argv); -DWORD rb_w32_asynchronize(asynchronous_func_t func, DWORD self, int argc, DWORD* argv, DWORD intrval); +typedef uintptr_t (*asynchronous_func_t)(uintptr_t self, int argc, uintptr_t* argv); +uintptr_t rb_w32_asynchronize(asynchronous_func_t func, uintptr_t self, int argc, uintptr_t* argv, uintptr_t intrval); #if defined(__cplusplus) #if 0 |