nobu	2013-05-14 14:52:06 +0900 (Tue, 14 May 2013)

  New Revision: 40722

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40722

  Log:
    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.

  Modified files:
    trunk/ChangeLog
    trunk/include/ruby/win32.h

Index: include/ruby/win32.h
===================================================================
--- include/ruby/win32.h	(revision 40721)
+++ include/ruby/win32.h	(revision 40722)
@@ -81,24 +81,34 @@ extern "C++" {			/* template without ext https://github.com/ruby/ruby/blob/trunk/include/ruby/win32.h#L81
 # 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
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40721)
+++ ChangeLog	(revision 40722)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue May 14 14:51:52 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* win32/win32.c (NET_LUID): mingw may have NET_LUID and not defined

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/