yugui	2010-10-23 22:38:23 +0900 (Sat, 23 Oct 2010)

  New Revision: 29573

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

  Log:
    merges r29151 from trunk into ruby_1_9_2.
    --
    * ext/tk/stubs.c: fix [Bug #3771] "VC++ can't make ext/tk with enabling
      stubs". Thanks, Akio Tajima [ruby-dev:42159].

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/tk/stubs.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 29572)
+++ ruby_1_9_2/ChangeLog	(revision 29573)
@@ -1,3 +1,8 @@
+Tue Aug 31 17:32:34 2010  Hidetoshi NAGAI  <nagai@a...>
+
+	* ext/tk/stubs.c: fix [Bug #3771] "VC++ can't make ext/tk with enabling
+	  stubs". Thanks, Akio Tajima [ruby-dev:42159].
+
 Mon Oct  4 12:43:47 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (regexp): dregexp has literal string only at the head
Index: ruby_1_9_2/ext/tk/stubs.c
===================================================================
--- ruby_1_9_2/ext/tk/stubs.c	(revision 29572)
+++ ruby_1_9_2/ext/tk/stubs.c	(revision 29573)
@@ -72,7 +72,11 @@
 #if defined USE_TCL_STUBS && defined USE_TK_STUBS
 
 #if defined _WIN32 || defined __CYGWIN__
-# include "util.h"
+#  ifdef HAVE_RUBY_RUBY_H
+#    include "ruby/util.h"
+#  else
+#    include "util.h"
+#  endif
 # include <windows.h>
   typedef HINSTANCE DL_HANDLE;
 # define DL_OPEN LoadLibrary
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 29572)
+++ ruby_1_9_2/version.h	(revision 29573)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 26
+#define RUBY_PATCHLEVEL 27
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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