summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-31 08:35:16 +0000
committernagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-31 08:35:16 +0000
commit9ec131e5c7da77028a1a87dfb8a0e05bd7f591f1 (patch)
treee9ecbc83f47b8b52c5cb019ba6627861f5f8daf4
parent3013a9de3ea912e34f91deb94ecbfb3f8f94e58b (diff)
* 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/branches/ruby_1_8@29152 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/tk/stubs.c6
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f8223ddb36..46cc36f00d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 31 17:32:34 2010 Hidetoshi NAGAI <[email protected]>
+
+ * ext/tk/stubs.c: fix [Bug #3771] "VC++ can't make ext/tk with enabling
+ stubs". Thanks, Akio Tajima [ruby-dev:42159].
+
Fri Aug 27 12:24:21 2010 Shugo Maeda <[email protected]>
* lib/net/imap.rb (initialize): sets sync_close to true.
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