[前][次][番号順一覧][スレッド一覧]

ruby-changes:22144

From: kosaki <ko1@a...>
Date: Tue, 3 Jan 2012 13:42:44 +0900 (JST)
Subject: [ruby-changes:22144] kosaki:r34193 (ruby_1_9_3): merge revision(s) 33556:

kosaki	2012-01-03 13:42:33 +0900 (Tue, 03 Jan 2012)

  New Revision: 34193

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

  Log:
    merge revision(s) 33556:
    
    * win32/Makefile.sub (CONFIG_H): have stdint.h if VC2010.
      [Bug #5243]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/version.h
    branches/ruby_1_9_3/win32/Makefile.sub

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34192)
+++ ruby_1_9_3/ChangeLog	(revision 34193)
@@ -1,3 +1,8 @@
+Mon Jan  2 23:41:57 2012  Tajima Akil <artonx@y...>
+
+	* win32/Makefile.sub (CONFIG_H): have stdint.h if VC2010.
+	  [Bug #5243]
+
 Mon Jan  2 21:40:45 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* tool/merger.rb (#version_up): version.h date should be Japanese
Index: ruby_1_9_3/win32/Makefile.sub
===================================================================
--- ruby_1_9_3/win32/Makefile.sub	(revision 34192)
+++ ruby_1_9_3/win32/Makefile.sub	(revision 34193)
@@ -540,42 +540,46 @@
 #define rb_uid_t int
 #define HAVE_STRUCT_STAT_ST_RDEV 1
 #define HAVE_ST_RDEV 1
-#define HAVE_INT8_T 1
+!if $(MSC_VER) >= 1600
+#define HAVE_STDINT_H 1
+!else
 #define int8_t signed char
-#define HAVE_UINT8_T 1
 #define uint8_t unsigned char
-#define SIZEOF_INT8_T 1
-#define SIZEOF_UINT8_T 1
+#define int16_t short
+#define uint16_t unsigned short
+#define int32_t int
+#define uint32_t unsigned int
+#define int64_t __int64
+#define uint64_t unsigned __int64
 #define INT8_MIN _I8_MIN
 #define INT8_MAX _I8_MAX
 #define UINT8_MAX _UI8_MAX
+#define INT16_MIN _I16_MIN
+#define INT16_MAX _I16_MAX
+#define UINT16_MAX _UI16_MAX
+#define INT32_MIN _I32_MIN
+#define INT32_MAX _I32_MAX
+#define UINT32_MAX _UI32_MAX
+#define INT64_MIN _I64_MIN
+#define INT64_MAX _I64_MAX
+#define UINT64_MAX _UI64_MAX
+!endif
+#define HAVE_INT8_T 1
+#define HAVE_UINT8_T 1
+#define SIZEOF_INT8_T 1
+#define SIZEOF_UINT8_T 1
 #define HAVE_INT16_T 1
-#define int16_t short
 #define HAVE_UINT16_T 1
-#define uint16_t unsigned short
 #define SIZEOF_INT16_T 2
 #define SIZEOF_UINT16_T 2
-#define INT16_MIN _I16_MIN
-#define INT16_MAX _I16_MAX
-#define UINT16_MAX _UI16_MAX
 #define HAVE_INT32_T 1
-#define int32_t int
 #define HAVE_UINT32_T 1
-#define uint32_t unsigned int
 #define SIZEOF_INT32_T 4
 #define SIZEOF_UINT32_T 4
-#define INT32_MIN _I32_MIN
-#define INT32_MAX _I32_MAX
-#define UINT32_MAX _UI32_MAX
 #define HAVE_INT64_T 1
-#define int64_t __int64
 #define HAVE_UINT64_T 1
-#define uint64_t unsigned __int64
 #define SIZEOF_INT64_T 8
 #define SIZEOF_UINT64_T 8
-#define INT64_MIN _I64_MIN
-#define INT64_MAX _I64_MAX
-#define UINT64_MAX _UI64_MAX
 #define HAVE_INTPTR_T 1
 #define HAVE_UINTPTR_T 1
 #define HAVE_SSIZE_T 1
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34192)
+++ ruby_1_9_3/version.h	(revision 34193)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 14
+#define RUBY_PATCHLEVEL 15
 
 #define RUBY_RELEASE_DATE "2012-01-03"
 #define RUBY_RELEASE_YEAR 2012

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

[前][次][番号順一覧][スレッド一覧]