From b0993426bb87d658ee630c7e7f20114e5857d6a9 Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 31 Aug 2010 08:34:56 +0000
Subject: [PATCH] * ext/tk/stubs.c: fix [Bug #3771] "VC++ can't make ext/tk
 with enabling   stubs". Thanks, Akio Tajima [ruby-dev:42159].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29151 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog      | 5 +++++
 ext/tk/stubs.c | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 261444a13e..708250ad0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 31 17:32:34 2010  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/stubs.c: fix [Bug #3771] "VC++ can't make ext/tk with enabling
+	  stubs". Thanks, Akio Tajima [ruby-dev:42159].
+
 Tue Aug 31 03:42:14 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* string.c (tr_setup_table): fix bug in r29146.
diff --git a/ext/tk/stubs.c b/ext/tk/stubs.c
index d76e0c8632..4b02fdd728 100644
--- a/ext/tk/stubs.c
+++ b/ext/tk/stubs.c
@@ -72,7 +72,11 @@ _nativethread_consistency_check(ip)
 #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