mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
win32.h: fix for VC9
* include/ruby/win32.h (INTPTR_MAX, INTPTR_MIN, UINTPTR_MAX): split from intptr_t and uintptr_t, since VC9 defines the latters only in crtdefs.h. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40722 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
77753bd9ec
commit
f83c42d970
2 changed files with 20 additions and 4 deletions
|
@ -1,3 +1,9 @@
|
|||
Tue May 14 14:51:52 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* include/ruby/win32.h (INTPTR_MAX, INTPTR_MIN, UINTPTR_MAX): split
|
||||
from intptr_t and uintptr_t, since VC9 defines the latters only in
|
||||
crtdefs.h.
|
||||
|
||||
Tue May 14 12:21:28 2013 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||
|
||||
* win32/win32.c (NET_LUID): mingw may have NET_LUID and not defined
|
||||
|
|
|
@ -81,24 +81,34 @@ extern "C++" { /* template without extern "C++" */
|
|||
# if !defined(_INTPTR_T_DEFINED)
|
||||
# ifdef _WIN64
|
||||
typedef __int64 intptr_t;
|
||||
# define INTPTR_MAX 9223372036854775807I64
|
||||
# else
|
||||
typedef int intptr_t;
|
||||
# endif
|
||||
# define _INTPTR_T_DEFINED
|
||||
# endif
|
||||
# if !defined(INTPTR_MAX)
|
||||
# ifdef _WIN64
|
||||
# define INTPTR_MAX 9223372036854775807I64
|
||||
# else
|
||||
# define INTPTR_MAX 2147483647
|
||||
# endif
|
||||
# define INTPTR_MIN (-INTPTR_MAX-1)
|
||||
# define _INTPTR_T_DEFINED
|
||||
# endif
|
||||
# if !defined(_UINTPTR_T_DEFINED)
|
||||
# ifdef _WIN64
|
||||
typedef unsigned __int64 uintptr_t;
|
||||
# define UINTPTR_MAX 18446744073709551615UI64
|
||||
# else
|
||||
typedef unsigned int uintptr_t;
|
||||
# define UINTPTR_MAX 4294967295U
|
||||
# endif
|
||||
# define _UINTPTR_T_DEFINED
|
||||
# endif
|
||||
# if !defined(UINTPTR_MAX)
|
||||
# ifdef _WIN64
|
||||
# define UINTPTR_MAX 18446744073709551615UI64
|
||||
# else
|
||||
# define UINTPTR_MAX 4294967295U
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
#ifndef __MINGW32__
|
||||
# define mode_t int
|
||||
|
|
Loading…
Add table
Reference in a new issue