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

ruby-changes:20272

From: shyouhei <ko1@a...>
Date: Thu, 30 Jun 2011 12:53:39 +0900 (JST)
Subject: [ruby-changes:20272] shyouhei:r32320 (ruby_1_8_7): merge revision(s) 32289:

shyouhei	2011-06-30 12:53:30 +0900 (Thu, 30 Jun 2011)

  New Revision: 32320

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

  Log:
    merge revision(s) 32289:
    * ext/tk/extconf.rb (intptr_t, uintptr_t): support for the latest ActiveTcl with mingw.

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/ext/tk/extconf.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ext/tk/extconf.rb
===================================================================
--- ruby_1_8_7/ext/tk/extconf.rb	(revision 32319)
+++ ruby_1_8_7/ext/tk/extconf.rb	(revision 32320)
@@ -2017,6 +2017,9 @@
   $INSTALLFILES ||= []
   $INSTALLFILES << ["lib/tkextlib/SUPPORT_STATUS", "$(RUBYLIBDIR)", "lib"]
 
+  # remove harmful definitions.
+  $defs.delete_if{|x|/^-Du?intptr_t=/ =~ x}
+
   # create
   $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
   $defs << %[-DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"]
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 32319)
+++ ruby_1_8_7/ChangeLog	(revision 32320)
@@ -1,3 +1,7 @@
+Thu Jun 30 12:52:56 2011  WATANABE Hirofumi  <eban@r...>
+
+	* ext/tk/extconf.rb (intptr_t, uintptr_t): support for the latest ActiveTcl with mingw.
+
 Sun Jun 26 17:52:32 2011  Nobuhiro Iwamatsu  <iwamatsu@n...>
 
         * ext/openssl/ossl_ssl.c: By trunk@31346, function check of SSLv2 is executed.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 32319)
+++ ruby_1_8_7/version.h	(revision 32320)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2011-06-26"
+#define RUBY_RELEASE_DATE "2011-06-30"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20110626
-#define RUBY_PATCHLEVEL 351
+#define RUBY_RELEASE_CODE 20110630
+#define RUBY_PATCHLEVEL 352
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2011
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 26
+#define RUBY_RELEASE_DAY 30
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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

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