diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-16 16:07:54 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-16 16:07:54 +0000 |
commit | b45f04a66f65fd39b5f9521a30fc19c00143bd4c (patch) | |
tree | 9811806e1764d596a548e5099233e2dabf78d268 | |
parent | db6099161bc49b447c824c79be7cd08f97f41495 (diff) | |
download | ruby-b45f04a66f65fd39b5f9521a30fc19c00143bd4c.tar.gz |
* dln.c (rb_w32_check_imported): workaround for VC6.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27852 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | dln.c | 2 | ||||
-rw-r--r-- | version.h | 4 |
3 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Mon May 17 01:07:48 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * dln.c (rb_w32_check_imported): workaround for VC6. + Sun May 16 22:21:32 2010 Yusuke Endoh <mame@tsg.ne.jp> * proc.c (mnew): initialize a field. a patch from Takahiro Kambe. @@ -1210,7 +1210,7 @@ rb_w32_check_imported(HMODULE ext, HMODULE mine) PIMAGE_THUNK_DATA pint = (PIMAGE_THUNK_DATA)((char *)ext + desc->Characteristics); PIMAGE_THUNK_DATA piat = (PIMAGE_THUNK_DATA)((char *)ext + desc->FirstThunk); while (piat->u1.Function) { - PIMAGE_IMPORT_BY_NAME pii = (PIMAGE_IMPORT_BY_NAME)((char *)ext + pint->u1.AddressOfData); + PIMAGE_IMPORT_BY_NAME pii = (PIMAGE_IMPORT_BY_NAME)((char *)ext + (size_t)pint->u1.AddressOfData); static const char prefix[] = "rb_"; if (strncmp(pii->Name, prefix, sizeof(prefix) - 1) == 0) { FARPROC addr = GetProcAddress(mine, pii->Name); @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_RELEASE_DATE "2010-05-16" +#define RUBY_RELEASE_DATE "2010-05-17" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 16 +#define RUBY_RELEASE_DAY 17 #include "ruby/version.h" |