diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-23 13:38:23 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-10-23 13:38:23 +0000 |
| commit | b98fa0b2a52d8b8bb38611d6bace9fed986aea5f (patch) | |
| tree | e88d4c765db09fb4729f9e595ace5fd3d23a3075 /ext | |
| parent | ac83fcdc8ea49cdf30174b452793510d16179642 (diff) | |
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].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/tk/stubs.c | 6 |
1 files changed, 5 insertions, 1 deletions
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 |