diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-25 00:30:46 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-25 00:30:46 +0000 |
| commit | 6249dac0aecb125b9acf069f502335cfcc29c2af (patch) | |
| tree | b0f4b2071acb0f37e5b2f3a15bbc2839da10a1c3 | |
| parent | 0414c9b901a3764b7cdb549d3273e7e54210c8ff (diff) | |
merge revision(s) 36544: [Backport #7017]
* win32/mkexports.rb: should not export DllMain().
reported by luis at [ruby-core:46743] [Bug #6790], solved by
Heesob Park, and confirmed by nobu.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | version.h | 6 | ||||
| -rwxr-xr-x | win32/mkexports.rb | 4 |
3 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Tue Sep 25 09:30:36 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/mkexports.rb: should not export DllMain(). + reported by luis at [ruby-core:46743] [Bug #6790], solved by + Heesob Park, and confirmed by nobu. + Mon Sep 24 16:34:07 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com> * include/ruby/win32.h (rb_w32_pow): add new function. @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 276 +#define RUBY_PATCHLEVEL 277 -#define RUBY_RELEASE_DATE "2012-09-24" +#define RUBY_RELEASE_DATE "2012-09-25" #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 9 -#define RUBY_RELEASE_DAY 24 +#define RUBY_RELEASE_DAY 25 #include "ruby/version.h" diff --git a/win32/mkexports.rb b/win32/mkexports.rb index 9b450519ce..22c0019294 100755 --- a/win32/mkexports.rb +++ b/win32/mkexports.rb @@ -112,7 +112,7 @@ class Exports::Mswin < Exports is_data = !$1 if noprefix or /^[@_]/ =~ l next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{8,16}$/ =~ l || - /^_(?:Init_|.*_threadptr_|DllMain@)/ =~ l + /^_?(?:Init_|.*_threadptr_|DllMain\b)/ =~ l l.sub!(/^[@_]/, '') if /@\d+$/ !~ l elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1') next @@ -146,7 +146,7 @@ class Exports::Cygwin < Exports def each_export(objs) symprefix = RbConfig::CONFIG["SYMBOL_PREFIX"] symprefix.strip! if symprefix - re = /\s(?:(T)|[[:upper:]])\s#{symprefix}((?!Init_|.*_threadptr_|DllMain@).*)$/ + re = /\s(?:(T)|[[:upper:]])\s#{symprefix}((?!Init_|.*_threadptr_|DllMain\b).*)$/ objdump(objs) do |l| next if /@.*@/ =~ l yield $2, !$1 if re =~ l |