diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-05 04:09:45 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-05 04:09:45 +0000 |
| commit | f1c86c1bb22e7b999449cee398e0e804f21ea18f (patch) | |
| tree | 33fc82783864892b74e8b448ca493b319b383c7c | |
| parent | b847ca06bf3f5026a8e9ee31fd0daea4436832e6 (diff) | |
| download | ruby-f1c86c1bb22e7b999449cee398e0e804f21ea18f.tar.gz | |
* win32/mkexports.rb (each_export): VC10 support.
a patch from Charlie Savage in [ruby-core:29254]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27220 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | win32/mkexports.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Apr 5 13:08:24 2010 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/mkexports.rb (each_export): VC10 support. + a patch from Charlie Savage in [ruby-core:29254] + Sun Apr 4 22:18:32 2010 Tanaka Akira <akr@fsij.org> * time.c (cmp): optimize for fixnums. diff --git a/win32/mkexports.rb b/win32/mkexports.rb index 2fac64bea3..e96f9339d0 100755 --- a/win32/mkexports.rb +++ b/win32/mkexports.rb @@ -110,7 +110,7 @@ class Exports::Mswin < Exports next unless l.sub!(/.*?\s(\(\)\s+)?External\s+\|\s+/, '') is_data = !$1 if noprefix or /^[@_]/ =~ l - next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{16}$/ =~ l || /^_DllMain@/ =~ l + next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{8,16}$/ =~ l || /^_DllMain@/ =~ l l.sub!(/^[@_]/, '') if /@\d+$/ !~ l elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1') next |