kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

win32.h: fix for VC9

Browse source 
* 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:
nobu 2013-05-14 05:52:06 +00:00
parent 77753bd9ec
commit f83c42d970
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> 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 * win32/win32.c (NET_LUID): mingw may have NET_LUID and not defined

18
include/ruby/win32.h
View file

@ -81,24 +81,34 @@ extern "C++" { /* template without extern "C++" */
# if !defined(_INTPTR_T_DEFINED) # if !defined(_INTPTR_T_DEFINED)
# ifdef _WIN64 # ifdef _WIN64
typedef __int64 intptr_t; typedef __int64 intptr_t;
# define INTPTR_MAX 9223372036854775807I64
# else # else
typedef int intptr_t; 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 # define INTPTR_MAX 2147483647
# endif # endif
# define INTPTR_MIN (-INTPTR_MAX-1) # define INTPTR_MIN (-INTPTR_MAX-1)
# define _INTPTR_T_DEFINED
# endif # endif
# if !defined(_UINTPTR_T_DEFINED) # if !defined(_UINTPTR_T_DEFINED)
# ifdef _WIN64 # ifdef _WIN64
typedef unsigned __int64 uintptr_t; typedef unsigned __int64 uintptr_t;
# define UINTPTR_MAX 18446744073709551615UI64
# else # else
typedef unsigned int uintptr_t; typedef unsigned int uintptr_t;
# define UINTPTR_MAX 4294967295U
# endif # endif
# define _UINTPTR_T_DEFINED # define _UINTPTR_T_DEFINED
# endif # endif
# if !defined(UINTPTR_MAX)
# ifdef _WIN64
# define UINTPTR_MAX 18446744073709551615UI64
# else
# define UINTPTR_MAX 4294967295U
# endif
# endif
#endif #endif
#ifndef __MINGW32__ #ifndef __MINGW32__
# define mode_t int # define mode_t int